diff --git a/src/gs-entbase/shared/NSInteractiveSurface.qc b/src/gs-entbase/shared/NSInteractiveSurface.qc
index 08c19948..282593ad 100644
--- a/src/gs-entbase/shared/NSInteractiveSurface.qc
+++ b/src/gs-entbase/shared/NSInteractiveSurface.qc
@@ -234,6 +234,7 @@ NSInteractiveSurface::Spawned(void)
 
 	/* initialize UI panel here */
 	m_UIChain = spawn(CUIWidget);
+	m_UIChain.m_iFlags = 1;
 
 	child = UIClass_Spawn(m_strUIClass);
 
@@ -279,6 +280,8 @@ TestUI::TestTrigger(void)
 void
 TestUI::Spawned(void)
 {
+	super::Spawned();
+	
 	testbutton = spawn(CUIButton);
 	testbutton.SetPos([32,48]);
 	testbutton.SetTitle("Test Button!");
diff --git a/src/menu-vgui/defs.h b/src/menu-vgui/defs.h
index ec897fdc..97c770c8 100755
--- a/src/menu-vgui/defs.h
+++ b/src/menu-vgui/defs.h
@@ -30,3 +30,5 @@ var float lasttime;
 
 #define TARGET_MENU 	1
 #define TARGET_CLIENT 	2
+
+var vector g_vecMousePos;
diff --git a/src/menu-vgui/main.qc b/src/menu-vgui/main.qc
index f609765e..a048135d 100644
--- a/src/menu-vgui/main.qc
+++ b/src/menu-vgui/main.qc
@@ -104,6 +104,8 @@ float Menu_InputEvent ( float evtype, float scanx, float chary, float devid )
 			break;
 	}
 
+	g_vecMousePos = getmousepos();
+
 	g_uiDesktop.Input( evtype, scanx, chary, devid );
 	return (float)g_iMenuActive;
 }
diff --git a/src/vgui/ui.qc b/src/vgui/ui.qc
index 08ea2bfb..98e769c3 100644
--- a/src/vgui/ui.qc
+++ b/src/vgui/ui.qc
@@ -231,6 +231,7 @@ UISystem_Init(void)
 	precache_pic("textures/ui/steam/icon_close");
 }
 
+#ifdef CLIENT
 CUIWidget
 UIClass_Spawn(string cname)
 {
@@ -251,3 +252,4 @@ UIClass_Spawn(string cname)
 
 	return __NULL__;
 }
+#endif
diff --git a/src/vgui/ui_window.qc b/src/vgui/ui_window.qc
index cab05c07..6c6b913e 100644
--- a/src/vgui/ui_window.qc
+++ b/src/vgui/ui_window.qc
@@ -178,7 +178,6 @@ void CUIWindow::Show(void)
 
 void CUIWindow::Draw(void)
 {
-
 #ifdef CLASSIC_VGUI
 	drawfill(m_vecOrigin, m_vecSize, [0,0,0], 0.5);
 	drawfill(m_vecOrigin, [m_vecSize[0], 1], m_vecColor, 1.0f);