diff --git a/uppsrc/IconDes/IconDes.key b/uppsrc/IconDes/IconDes.key
index 6155c4070..95d994cbb 100644
--- a/uppsrc/IconDes/IconDes.key
+++ b/uppsrc/IconDes/IconDes.key
@@ -1,3 +1,7 @@
+#ifdef DUPLICATE
+	#undef DUPLICATE
+#endif
+
 KEY(INSERT_IMAGE, "Insert image..", K_INSERT)
 KEY(IMAGE, "Image..", 0)
 KEY(REMOVE_IMAGE, "Remove image", 0)
diff --git a/uppsrc/ide/Cpp.cpp b/uppsrc/ide/Cpp.cpp
index 9d448e7b3..a18a80bb1 100644
--- a/uppsrc/ide/Cpp.cpp
+++ b/uppsrc/ide/Cpp.cpp
@@ -289,6 +289,7 @@ void AssistEditor::GatherItems(const String& type, bool only_public, Index<Strin
 				}
 				CppItemInfo& f = assist_item.Add(im.name);
 				f.typei = typei;
+				f.scope = ntp;
 				(CppItem&)f = im;
 			}
 		}