diff --git a/uppsrc/CodeEditor/FindReplace.cpp b/uppsrc/CodeEditor/FindReplace.cpp
index 7ce6028e2..f86cd7cfc 100644
--- a/uppsrc/CodeEditor/FindReplace.cpp
+++ b/uppsrc/CodeEditor/FindReplace.cpp
@@ -475,7 +475,7 @@ void CodeEditor::OpenNormalFindReplace(bool replace)
 	findreplace.next <<= THISBACK(DoFind);
 	findreplace.close <<= THISBACK(CloseFindReplace);
 	if(!findreplace.IsOpen())
-		AddFrame(findreplace);
+		InsertFrame(FindFrame(sb), findreplace);
 	WhenOpenFindReplace();
 	IncrementalFind();
 }
diff --git a/uppsrc/CodeEditor/init b/uppsrc/CodeEditor/init
index ed5b8df8a..10cfbc151 100644
--- a/uppsrc/CodeEditor/init
+++ b/uppsrc/CodeEditor/init
@@ -1,7 +1,7 @@
 #ifndef _CodeEditor_icpp_init_stub
 #define _CodeEditor_icpp_init_stub
 #include "CtrlLib/init"
-#define BLITZ_INDEX__ Fa19bf999ba2b201492446aa335bd578e
+#define BLITZ_INDEX__ Fd579c6629af5990c016d4bd1dc2b4c20
 #include "CRegister.icpp"
 #undef BLITZ_INDEX__
 #endif
diff --git a/uppsrc/CppBase/Parser.cpp b/uppsrc/CppBase/Parser.cpp
index c8fb04139..02e793ccd 100644
--- a/uppsrc/CppBase/Parser.cpp
+++ b/uppsrc/CppBase/Parser.cpp
@@ -681,7 +681,7 @@ Array<Parser::Decl> Parser::Declaration0(bool l0, bool more)
 			break;
 	}
 	Qualifier();
-	if(l0)
+	if(l0) {
 		if(lex == tk_SKYLARK && lex[1] == '(' && lex.IsId(2)) {
 			++lex;
 			++lex;
@@ -715,6 +715,7 @@ Array<Parser::Decl> Parser::Declaration0(bool l0, bool more)
 			Key(')');
 			return r;
 		}
+	}
 	bool isdestructor = Key('~');
 	if(l0 && context.typenames.Find(lex) >= 0 && lex[1] == '(' && lex.IsId()) {
 		Decl& a = r.Add();
diff --git a/uppsrc/CtrlLib/MenuBar.cpp b/uppsrc/CtrlLib/MenuBar.cpp
index afaa81d06..b3be0d598 100644
--- a/uppsrc/CtrlLib/MenuBar.cpp
+++ b/uppsrc/CtrlLib/MenuBar.cpp
@@ -280,7 +280,7 @@ bool MenuKeyHook(Ctrl *ctrl, dword key, int count)
 bool MenuMouseHook(Ctrl *ctrl, bool inframe, int event, Point p,
 	               int zdelta, dword keyflags)
 {
-	if(event & (Ctrl::MOUSEWHEEL, Ctrl::DOWN, Ctrl::UP))
+	if(event & (Ctrl::MOUSEWHEEL|Ctrl::DOWN|Ctrl::UP))
 		s_doaltkey = false;
 	return false;
 }