diff --git a/uppsrc/CtrlLib/ArrayCtrl.cpp b/uppsrc/CtrlLib/ArrayCtrl.cpp
index bff6f3250..db339062b 100644
--- a/uppsrc/CtrlLib/ArrayCtrl.cpp
+++ b/uppsrc/CtrlLib/ArrayCtrl.cpp
@@ -1901,7 +1901,7 @@ void ArrayCtrl::Set(int ii, const VectorMap<String, Value>& m)
 	}
 }
 
-void ArrayCtrl::Set(int ii, const ValueMap& m)
+void ArrayCtrl::SetMap(int ii, const ValueMap& m)
 {
 	for(int i = 0; i < m.GetCount(); i++) {
 		int j = GetPos((String)m.GetKey(i));
@@ -1915,7 +1915,7 @@ void ArrayCtrl::Add(const VectorMap<String, Value>& m)
 	Set(array.GetCount(), m);
 }
 
-void ArrayCtrl::Add(const ValueMap& m)
+void ArrayCtrl::AddMap(const ValueMap& m)
 {
 	Set(array.GetCount(), m);
 }
diff --git a/uppsrc/CtrlLib/ArrayCtrl.h b/uppsrc/CtrlLib/ArrayCtrl.h
index a37ea3e55..57cb90966 100644
--- a/uppsrc/CtrlLib/ArrayCtrl.h
+++ b/uppsrc/CtrlLib/ArrayCtrl.h
@@ -317,6 +317,10 @@ private:
 
 	using Ctrl::IsModified;
 
+	// These are listed here as private because name has changed to SetMap/AddMap
+	void       Set(int i, const ValueMap& m);
+	void       Add(const ValueMap& m);
+
 public: // temporary (TRC 06/07/28) // will be removed!
 	Ctrl&  SetCtrl(int i, int j, Ctrl *newctrl) { return SetCtrl(i, j, newctrl, true, true); }
 
@@ -438,7 +442,6 @@ public:
 
 	void       Set(int i, const Vector<Value>& v);
 	void       Set(int i, const VectorMap<String, Value>& m);
-	void       Set(int i, const ValueMap& m);
 
 	void       Add();
 
@@ -451,7 +454,9 @@ public:
 	void       Add(const Vector<Value>& v);
 	void       Add(const Nuller& null)                          { Add((Value)Null); }
 	void       Add(const VectorMap<String, Value>& m);
-	void       Add(const ValueMap& m);
+
+	void       SetMap(int i, const ValueMap& m);
+	void       AddMap(const ValueMap& m);
 
 	void       SetArray(int i, const ValueArray& va);
 	void       AddArray(const ValueArray& va);
diff --git a/uppsrc/ide/ide.key b/uppsrc/ide/ide.key
index c6a50f0f5..26b8568c9 100644
--- a/uppsrc/ide/ide.key
+++ b/uppsrc/ide/ide.key
@@ -9,8 +9,8 @@ KEY(EXIT, "Exit", K_CTRL_Q)
 KEY(SPLIT, "Split editor vertical", K_CTRL_MINUS)
 KEY(VSPLIT, "Split editor horizontal", K_CTRL_BACKSLASH)
 KEY(SWAP, "Other editor", K_CTRL_GRAVE)
-KEY(CLOSETAB, "Close file tab", K_CTRL_U)
-KEY(CLOSETABS, "Close all file tabs", K_SHIFT|K_CTRL_U)
+KEY(CLOSETAB, "Close file tab", K_CTRL_W)
+KEY(CLOSETABS, "Close all file tabs", K_SHIFT|K_CTRL_W)
 KEY(PRINT, "Print..", K_CTRL_P)
 
 KEY(FINDINFILES, "Find in Files..", K_CTRL_F|K_SHIFT)
@@ -108,4 +108,4 @@ KEY(TOCSTRING, "Convert to C string", 0)
 
 KEY(DIFF, "Compare with file..", 0)
 KEY(SVNDIFF, "Show svn history of file..", 0)
-KEY(PATCH, "Patch/diff..", 0)
+KEY(PATCH, "Patch/diff..", 0)
\ No newline at end of file