diff --git a/sample/CustomScrollableWidget.cs b/sample/CustomScrollableWidget.cs
index a06e03c18..5403cc561 100644
--- a/sample/CustomScrollableWidget.cs
+++ b/sample/CustomScrollableWidget.cs
@@ -203,13 +203,13 @@ class CustomScrollableWidget<T> : CustomBase, IScrollableImplementor {
 		}
 	}
 	
-	private void OnHadjustmentChanged (object o, EventArgs args)
+	private void OnHadjustmentChanged (object o, System.EventArgs args)
 	{
 		UpdateAdjustments ();
 		QueueDraw ();
 	}
 	
-	private void OnVadjustmentChanged (object o, EventArgs args)
+	private void OnVadjustmentChanged (object o, System.EventArgs args)
 	{
 		UpdateAdjustments ();
 		QueueDraw ();
diff --git a/sample/GtkDemo/DemoTreeStore.cs b/sample/GtkDemo/DemoTreeStore.cs
index 3b9a0fd08..d06cb4c11 100644
--- a/sample/GtkDemo/DemoTreeStore.cs
+++ b/sample/GtkDemo/DemoTreeStore.cs
@@ -46,13 +46,13 @@ namespace GtkDemo
 			sw.Add (treeView);
 
 			// expand all rows after the treeview widget has been realized
-			treeView.Realized += new EventHandler (ExpandRows);
+			treeView.Realized += new System.EventHandler (ExpandRows);
 
 			SetDefaultSize (650, 400);
 			ShowAll ();
 		}
 
-		private void ExpandRows (object obj, EventArgs args)
+		private void ExpandRows (object obj, System.EventArgs args)
 		{
 			TreeView treeView = obj as TreeView;
 
diff --git a/sample/GtkDemo/Makefile.am b/sample/GtkDemo/Makefile.am
index 0b162eae7..f17e120c0 100644
--- a/sample/GtkDemo/Makefile.am
+++ b/sample/GtkDemo/Makefile.am
@@ -21,7 +21,6 @@ sources = \
 	DemoButtonBox.cs		\
 	DemoClipboard.cs		\
 	DemoColorSelection.cs	\
-	DemoCssBasics.cs		\
 	DemoDialog.cs			\
 	DemoDrawingArea.cs		\
 	DemoEditableCells.cs	\
diff --git a/sample/gtk-gio/MountOperation.cs b/sample/gtk-gio/MountOperation.cs
index f21416ee9..1d337cb97 100644
--- a/sample/gtk-gio/MountOperation.cs
+++ b/sample/gtk-gio/MountOperation.cs
@@ -46,14 +46,14 @@ public class TestMount
 		Window w = new Window ("test");
 		operation = new Gtk.MountOperation (w);
 		Button b = new Button ("Mount");
-		b.Clicked += new EventHandler (HandleButtonClicked);
+		b.Clicked += new System.EventHandler (HandleButtonClicked);
 		b.Show ();
 		w.Add (b);
 		w.Show ();
 		Gtk.Application.Run ();
 	}
 
-	static void HandleButtonClicked (object sender, EventArgs args)
+	static void HandleButtonClicked (object sender, System.EventArgs args)
 	{
 		System.Console.WriteLine ("clicked");
 		file.MountEnclosingVolume (0, operation, null, new GLib.AsyncReadyCallback (HandleMountFinished));