diff --git a/uppsrc/Core/Map.hpp b/uppsrc/Core/Map.hpp
index b4695a702..156216876 100644
--- a/uppsrc/Core/Map.hpp
+++ b/uppsrc/Core/Map.hpp
@@ -468,7 +468,7 @@ int AMap<K, T, V>::Put(const K& k, T&& x)
 		value[i] = x;
 	else {
 		ASSERT(i == value.GetCount());
-		value.AddPick(x);
+		value.AddPick(pick(x));
 	}
 	return i;
 }
diff --git a/uppsrc/Core/todo.txt b/uppsrc/Core/todo.txt
index 8b51bf6e4..6f2f7c742 100644
--- a/uppsrc/Core/todo.txt
+++ b/uppsrc/Core/todo.txt
@@ -2,18 +2,12 @@ CLANG11 autotest/Qtf : FAILED
 CLANG11 autotest/StringBuffer2GB : ERROR
 CLANG11 autotest/CheckDownloads : FAILED
 CLANG11 reference/Log : ERROR
-CLANG11 reference/Tuple : ERROR
-CLANG11 reference/SocketClient : ERROR
-CLANG11 reference/WebImage : ERROR
 CLANG11 reference/Zip : ERROR
-CLANG11 reference/NanoStrings : ERROR
 CLANG11 upptst/idetest : ERROR
 CLANG11 upptst/Zip : ERROR
-CLANG11 tutorial/Ntl10 : ERROR
 
 uppbox
 
-
 CLANG11 reference/CallbackPickClone : ERROR
 CLANG11 autotest/CallbackPick : ERROR