diff --git a/uppsrc/Core/App.cpp b/uppsrc/Core/App.cpp
index f9e768b02..7208d7608 100644
--- a/uppsrc/Core/App.cpp
+++ b/uppsrc/Core/App.cpp
@@ -300,7 +300,7 @@ void AppInit__(int argc, const char **argv, const char **envptr)
 		String varname(b, var);
 		if(*var == '=')
 			var++;
-		EnvMap().Add(varname.ToWString(), var.ToWString());
+		EnvMap().Add(varname.ToWString(), String(var).ToWString());
 	}
 	Vector<String>& cmd = coreCmdLine__();
 	for(int i = 1; i < argc; i++)
diff --git a/uppsrc/CtrlLib/TreeCtrl.h b/uppsrc/CtrlLib/TreeCtrl.h
index 477370ea9..026eaf1dd 100644
--- a/uppsrc/CtrlLib/TreeCtrl.h
+++ b/uppsrc/CtrlLib/TreeCtrl.h
@@ -438,4 +438,4 @@ public:
 	DropTree& DropWidthZ(int w)                     { dropwidth = HorzLayoutZoom(w); return *this; }
 
 	DropTree();
-};
\ No newline at end of file
+};