diff --git a/sample/test/TestCheckButton.cs b/sample/test/TestCheckButton.cs
index f8c031a92..c317e525f 100644
--- a/sample/test/TestCheckButton.cs
+++ b/sample/test/TestCheckButton.cs
@@ -51,7 +51,7 @@ namespace WidgetViewer {
 			box1.PackStart (box2, false, false, 0);
 
 			Button button = Button.NewFromStock (Stock.Close);
-			button.Clicked += new EventHandler (Close_Button);
+			button.Clicked += new EventHandler (OnCloseClicked);
 			button.CanDefault = true;
 			
 			box2.PackStart (button, true, true, 0);
@@ -59,7 +59,7 @@ namespace WidgetViewer {
 			return window;
 		}
 
-		static void Close_Button (object o, EventArgs args)
+		static void OnCloseClicked (object o, EventArgs args)
 		{
 			window.Destroy ();
 		}
diff --git a/sample/test/TestColorSelection.cs b/sample/test/TestColorSelection.cs
index 159438287..4eb861fe9 100644
--- a/sample/test/TestColorSelection.cs
+++ b/sample/test/TestColorSelection.cs
@@ -88,7 +88,7 @@ namespace WidgetViewer {
 		static void Color_Selection_OK (object o, EventArgs args)
 		{
 			Gdk.Color selected = window.ColorSelection.CurrentColor;
-			if (selected.IsNull)
+			if (selected == Gdk.Color.Zero)
 				Console.WriteLine ("Color selection failed.");
 			else {
 				window.Hide ();
@@ -109,7 +109,7 @@ namespace WidgetViewer {
 
 		static void Display_Result (Gdk.Color color)
 		{
-			if (color.IsNull)
+			if (color == Gdk.Color.Zero)
 				Console.WriteLine ("Null color");
 
 			dialog = new Dialog ();