diff --git a/uppsrc/Core/Ini.cpp b/uppsrc/Core/Ini.cpp
index 0cd75df46..490b27b32 100644
--- a/uppsrc/Core/Ini.cpp
+++ b/uppsrc/Core/Ini.cpp
@@ -124,19 +124,6 @@ String GetIniFile()
 static VectorMap<String, String>& sIniKeys()
 {
 	static VectorMap<String, String> key;
-	return key;
-}
-
-VectorMap<String, String> GetIniKeys()
-{
-	Mutex::Lock __(sMtx);
-	return VectorMap<String, String>(sIniKeys(), 0);
-}
-
-String GetIniKey(const char *id, const String& def) {
-	ASSERT_(IsMainRunning(), "GetIniKey is allowed only after APP_MAIN has started");
-	Mutex::Lock __(sMtx);
-	VectorMap<String, String>& key = sIniKeys();
 	static int version;
 	if(version != ini_version__) {
 		version = ini_version__;
@@ -152,7 +139,19 @@ String GetIniKey(const char *id, const String& def) {
 			key = LoadIniFile(GetHomeDirFile("q.ini"));
 	#endif
 	}
-	return key.Get(id, def);
+	return key;
+}
+
+VectorMap<String, String> GetIniKeys()
+{
+	Mutex::Lock __(sMtx);
+	return clone(sIniKeys());
+}
+
+String GetIniKey(const char *id, const String& def) {
+	ASSERT_(IsMainRunning(), "GetIniKey is allowed only after APP_MAIN has started");
+	Mutex::Lock __(sMtx);
+	return sIniKeys().Get(id, def);
 }
 
 String GetIniKey(const char *id)
diff --git a/uppsrc/CtrlCore/Gtk.h b/uppsrc/CtrlCore/Gtk.h
index df48d726b..e4c8e0115 100644
--- a/uppsrc/CtrlCore/Gtk.h
+++ b/uppsrc/CtrlCore/Gtk.h
@@ -112,7 +112,7 @@ class ImageDraw : public SystemDraw {
 	void FetchStraight(ImageBuffer& b) const;
 
 public:
-	Draw& Alpha();                       
+	Draw& Alpha();
 
 	operator Image() const;