diff --git a/uppsrc/Core/Core.h b/uppsrc/Core/Core.h
index f3b841e72..84725e15f 100644
--- a/uppsrc/Core/Core.h
+++ b/uppsrc/Core/Core.h
@@ -80,7 +80,7 @@
 #endif //PLATFORM_POSIX
 
 #ifdef PLATFORM_POSIX
-#define	LOFF_T_      off_t
+#define LOFF_T_      off_t
 #define LSEEK64_     lseek
 #define FTRUNCATE64_ ftruncate
 #endif
diff --git a/uppsrc/CppBase/Pre.cpp b/uppsrc/CppBase/Pre.cpp
index ace46e24e..4f79784d9 100644
--- a/uppsrc/CppBase/Pre.cpp
+++ b/uppsrc/CppBase/Pre.cpp
@@ -66,7 +66,7 @@ SrcFile PreProcess(Stream& in, Parser& parser) // This is not really C preproces
 			if(s[0] == 'd' && s[1] == 'e' && s[2] == 'f' &&
 			   s[3] == 'i' && s[4] == 'n' && s[5] == 'e' && !iscid(s[6])) {
 				s += 6;
-				while(*s == ' ') s++;
+				while(*s == ' ' || *s == '\t') s++;
 				String macro;
 				while(iscid(*s))
 					macro.Cat(*s++);
diff --git a/uppsrc/ide/DCopy.cpp b/uppsrc/ide/DCopy.cpp
index 58cc03fb1..9765e6685 100644
--- a/uppsrc/ide/DCopy.cpp
+++ b/uppsrc/ide/DCopy.cpp
@@ -81,7 +81,7 @@ void AssistEditor::DCopy()
 		for(int i = 0; i < id.GetCount(); i++)
 			r << "\tvoid " << id[i] << "();\n";
 	}
-	else 
+	else
 		for(int i = 0; i < cpp.GetCount(); i++) {
 			const Array<CppItem>& n = cpp[i];
 			bool decl = decla;
diff --git a/uppsrc/ide/Goto.cpp b/uppsrc/ide/Goto.cpp
index 1e5e62cdf..3a07355fd 100644
--- a/uppsrc/ide/Goto.cpp
+++ b/uppsrc/ide/Goto.cpp
@@ -243,8 +243,7 @@ bool Ide::SwapSIf(const char *cref)
 	if(q < 0)
 		return false;
 	const Array<CppItem>& nn = CodeBase()[q];
-//	String qitem = QualifyKey(CodeBase(), p.current_scope, p.current_key, p.context.namespace_using);
-	if(cref && MakeCodeRef(p.current_scope, p.current_key) != cref)
+	if(cref && MakeCodeRef(p.current_scope, p.current_key) != cref || IsNull(p.current_name))
 		return false;
 	Vector<const CppItem *> n;
 	bool destructor = p.current_key.Find('~') >= 0;