diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 62df09752371a..b4368d2c9ecab 100644
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-21  Peter Dennis Bartok  <pbartok@novell.com> 
+
+	* ContainerControl.cs: Instead of throwing an exception, print
+	  a one-time warning about Validate not being implemented
+	* XplatUIWin32.cs: Removed debug output
+
 2005-09-21  Peter Dennis Bartok  <pbartok@novell.com> 
 
 	* Control.cs: Only set XplatUI background if we expect the windowing
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ContainerControl.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ContainerControl.cs
index fca4472c3d643..5d484aa6bf30d 100644
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ContainerControl.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ContainerControl.cs
@@ -115,8 +115,14 @@ public class ContainerControl : ScrollableControl, IContainerControl {
 
 		#region Public Instance Methods
 		[MonoTODO]
+		static bool ValidateWarned;
 		public bool Validate() {
-			throw new NotImplementedException();
+			//throw new NotImplementedException();
+			if (!ValidateWarned) {
+				Console.WriteLine("ContainerControl.Validate is not yet implemented");
+				ValidateWarned = true;
+			}
+			return true;
 		}
 
 		bool IContainerControl.ActivateControl(Control control) {
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
index be61021ba8e60..25928af7bd2c8 100644
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
@@ -1062,7 +1062,6 @@ internal enum GAllocFlags : uint {
 //				clip_rect = new Rectangle(rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top);
 
 				if (ps.fErase != 0) {
-Console.WriteLine("Hit Clear background");
 					EraseWindowBackground(handle, hdc);
 				}
 			} else {