diff --git a/rainbow/SDL20GL/Keys.h b/rainbow/SDL20GL/Keys.h
index 893da7085..5d5907434 100644
--- a/rainbow/SDL20GL/Keys.h
+++ b/rainbow/SDL20GL/Keys.h
@@ -108,3 +108,16 @@ K_CTRL_EQUAL     = K_CTRL|0xbb|K_DELTA,
 K_CTRL_APOSTROPHE= K_CTRL|0xde|K_DELTA,
 
 K_BREAK      = SDLK_PAUSE + K_DELTA, // Is it really?
+
+K_PLUS       = SDLK_PLUS,
+K_MINUS      = SDLK_MINUS,
+K_COMMA      = SDLK_COMMA,
+K_PERIOD     = SDLK_PERIOD,
+K_SEMICOLON  = SDLK_SEMICOLON,
+
+K_SLASH      = SDLK_SLASH,
+K_GRAVE      = SDLK_CARET,
+K_LBRACKET   = SDLK_LEFTBRACKET,
+K_BACKSLASH  = SDLK_BACKSLASH,
+K_RBRACKET   = SDLK_RIGHTBRACKET,
+K_QUOTEDBL   = SDLK_QUOTEDBL,
diff --git a/rainbow/SDL20GL/Top.cpp b/rainbow/SDL20GL/Top.cpp
index f2d207e6d..265e07a2a 100644
--- a/rainbow/SDL20GL/Top.cpp
+++ b/rainbow/SDL20GL/Top.cpp
@@ -42,7 +42,7 @@ void TopWindow::SyncCaption()
 	frame->sizeable = sizeable;
 	frame->RefreshLayout();
 	frame->Refresh();
-	frame->close <<= Proxy(WhenClose);
+	frame->close << [=] { WhenClose(); };
 	frame->icon = icon;
 	frame->Enable(IsEnabled());
 }
diff --git a/rainbow/SDL20GL/Wnd.cpp b/rainbow/SDL20GL/Wnd.cpp
index adc9fe863..a934e62c2 100644
--- a/rainbow/SDL20GL/Wnd.cpp
+++ b/rainbow/SDL20GL/Wnd.cpp
@@ -124,7 +124,7 @@ Ctrl *Ctrl::GetActiveCtrl()
 
 // Vector<Callback> Ctrl::hotkey;
 
-int Ctrl::RegisterSystemHotKey(dword key, Callback cb)
+int Ctrl::RegisterSystemHotKey(dword key, Function<void ()> cb)
 {
 /*	ASSERT(key >= K_DELTA);
 	int q = hotkey.GetCount();