diff --git a/uppsrc/CodeEditor/FindReplace.cpp b/uppsrc/CodeEditor/FindReplace.cpp
index b5a4eac32..7e0d653d1 100644
--- a/uppsrc/CodeEditor/FindReplace.cpp
+++ b/uppsrc/CodeEditor/FindReplace.cpp
@@ -554,7 +554,6 @@ void CodeEditor::OpenNormalFindReplace0(bool replace)
 	if(GetLength() > 1000000)
 		findreplace.incremental <<= false;
 	findreplace.Setup(replace);
-	findreplace.find.SetFocus();
 	findreplace.itext = GetI();
 	findreplace.prev.Show();
 	findreplace.next <<= THISBACK(DoFind);
@@ -562,9 +561,9 @@ void CodeEditor::OpenNormalFindReplace0(bool replace)
 	if(!findreplace.IsOpen())
 		InsertFrame(FindFrame(sb), findreplace);
 	WhenOpenFindReplace();
+	findreplace.find.SetFocus();
 }
 
-
 void CodeEditor::OpenNormalFindReplace(bool replace)
 {
 	OpenNormalFindReplace0(replace);
diff --git a/uppsrc/ide/Debuggers/Cpu.cpp b/uppsrc/ide/Debuggers/Cpu.cpp
index a56ee658f..616e405a2 100644
--- a/uppsrc/ide/Debuggers/Cpu.cpp
+++ b/uppsrc/ide/Debuggers/Cpu.cpp
@@ -2,8 +2,6 @@
 
 #ifdef COMPILER_MSC
 
-#define CPU_REG(sym, context_var, kind, name, flags) { sym, kind, name, flags },
-
 uint32 Pdb::GetRegister32(const Context& ctx, int sym)
 {
 	switch(sym) {
@@ -30,14 +28,14 @@ const VectorMap<int, Pdb::CpuRegister>& Pdb::GetRegisterList()
 {
 	static VectorMap<int, CpuRegister> r32;
 	ONCELOCK {
-#define CPU_REG(sym_, context_var, kind, name_, flags_) { CpuRegister& r = r32.Add(sym_); r.sym = sym_; r.name = name_; r.flags = flags_; }
+#define CPU_REG(sym_, context_var, kind_, name_, flags_) { CpuRegister& r = r32.Add(sym_); r.sym = sym_; r.kind = kind_; r.name = name_; r.flags = flags_; }
 		#include "i386.cpu"
 #undef CPU_REG
 	}
 #ifdef CPU_64
 	static VectorMap<int, CpuRegister> r64;
 	ONCELOCK {
-#define CPU_REG(sym_, context_var, kind, name_, flags_) { CpuRegister& r = r64.Add(sym_); r.sym = sym_; r.name = name_; r.flags = flags_; }
+#define CPU_REG(sym_, context_var, kind_, name_, flags_) { CpuRegister& r = r64.Add(sym_); r.sym = sym_; r.kind = kind_; r.name = name_; r.flags = flags_; }
 		#include "amd64.cpu"
 #undef CPU_REG
 	}