diff --git a/uppsrc/CppBase/ppconfig.cpp b/uppsrc/CppBase/ppconfig.cpp
index 7614223c1..2d04ebdb7 100644
--- a/uppsrc/CppBase/ppconfig.cpp
+++ b/uppsrc/CppBase/ppconfig.cpp
@@ -30,6 +30,7 @@ String GetStdDefs()
 	h = Split(ignore, ';');
 	for(int i = 0; i < h.GetCount(); i++)
 		defs << "#define " << h[i] << "\n";
+	defs << "#define NULL NULL";
 	return defs;
 }
 
diff --git a/uppsrc/ide/Assist.cpp b/uppsrc/ide/Assist.cpp
index 593ec5fb5..e097892e6 100644
--- a/uppsrc/ide/Assist.cpp
+++ b/uppsrc/ide/Assist.cpp
@@ -466,7 +466,7 @@ void AssistEditor::Assist()
 			Index<String> typeset = EvaluateExpressionType(parser, xp);
 			for(int i = 0; i < typeset.GetCount(); i++)
 				if(typeset[i].GetCount())
-					GatherItems(typeset[i], true, in_types, false);
+					GatherItems(typeset[i], xp[0] != "this", in_types, false);
 		}
 		else {
 			GatherItems(parser.current_scope, false, in_types, true);