diff --git a/reference/Framebuffer/Ctrl.cpp b/reference/Framebuffer/Ctrl.cpp
index a0d4ef73c..1b62e76ae 100644
--- a/reference/Framebuffer/Ctrl.cpp
+++ b/reference/Framebuffer/Ctrl.cpp
@@ -76,6 +76,10 @@ String Ctrl::Name() const {
 	return s;
 }
 
+void Ctrl::InstallPanicBox()
+{
+}
+
 END_UPP_NAMESPACE
 
 #endif
diff --git a/reference/Framebuffer/Image.cpp b/reference/Framebuffer/Image.cpp
index ec97c7b31..c9befe96a 100644
--- a/reference/Framebuffer/Image.cpp
+++ b/reference/Framebuffer/Image.cpp
@@ -16,37 +16,6 @@ void SetSurface(SystemDraw& w, const Rect& dest, const RGBA *pixels, Size psz, P
 	GuiLock __;
 }
 
-struct Image::Data::SystemData {
-};
-
-void Image::Data::SysInitImp()
-{
-	SystemData& sd = Sys();
-}
-
-void Image::Data::SysReleaseImp()
-{
-	SystemData& sd = Sys();
-}
-
-Image::Data::SystemData& Image::Data::Sys() const
-{
-	ASSERT(sizeof(system_buffer) >= sizeof(SystemData));
-	return *(SystemData *)system_buffer;
-}
-
-int  Image::Data::GetResCountImp() const
-{
-	SystemData& sd = Sys();
-	return 0;
-}
-
-void Image::Data::PaintImp(SystemDraw& w, int x, int y, const Rect& src, Color c)
-{
-	GuiLock __;
-	SystemData& sd = Sys();
-}
-
 Image ImageDraw::Get(bool pm) const
 {
 	ImageBuffer result(image.GetSize());
diff --git a/reference/Framebuffer/Wnd.cpp b/reference/Framebuffer/Wnd.cpp
index 3c93454c1..aab22e51d 100644
--- a/reference/Framebuffer/Wnd.cpp
+++ b/reference/Framebuffer/Wnd.cpp
@@ -192,10 +192,6 @@ bool Ctrl::ProcessEvent(bool *quit)
 {
 	LLOG("@ ProcessEvent");
 	ASSERT(IsMainThread());
-	if(DoCall()) {
-		SyncTopWindows();
-		return false;
-	}
 	if(!GetMouseLeft() && !GetMouseRight() && !GetMouseMiddle())
 		ReleaseCtrlCapture();
 	if(FBProcessEvent(quit)) {
@@ -450,9 +446,9 @@ void Ctrl::GuiSleep0(int ms)
 	GuiLock __;
 	ASSERT(IsMainThread());
 	LLOG("GuiSleep");
-	int level = LeaveGMutexAll();
+	int level = LeaveGuiMutexAll();
 	FBSleep(ms);
-	EnterGMutex(level);
+	EnterGuiMutex(level);
 }
 
 Rect Ctrl::GetWndScreenRect() const
@@ -641,7 +637,7 @@ bool Ctrl::HasWndCapture() const
 	return captureCtrl && captureCtrl->GetTopCtrl() == this;
 }
 
-void Ctrl::WndInvalidateRect0(const Rect& r)
+void Ctrl::WndInvalidateRect(const Rect& r)
 {
 	GuiLock __;
 	int q = FindTopCtrl();
diff --git a/reference/SqlCtrls/main.cpp b/reference/SqlCtrls/main.cpp
index 6c14c66a4..6413dc85c 100644
--- a/reference/SqlCtrls/main.cpp
+++ b/reference/SqlCtrls/main.cpp
@@ -18,9 +18,9 @@ PersonDlg::PersonDlg()
 {
 	CtrlLayoutOKCancel(*this, "Person");
 #ifdef flagSCH
-	ctrls(*this, PERSON);
+	ctrls(*this, PERSON); // matches widgets to columns based on Layout and schema introspection
 #else
-	ctrls
+	ctrls // "manual" variant
 		(NAME, name)
 		(LASTNAME, lastname)
 		(AGE, age)