diff --git a/uppsrc/Core/Core.h b/uppsrc/Core/Core.h
index c26f84555..b6648c2a1 100644
--- a/uppsrc/Core/Core.h
+++ b/uppsrc/Core/Core.h
@@ -437,4 +437,7 @@ void      FreeDll__(DLLHANDLE dllhandle);
 using Upp::byte; // Dirty solution to Windows.h typedef byte...
 #endif
 
+inline const char *t_(const char *s)  { return Upp::t_GetLngString(s); }
+inline const char *tt_(const char *s) { return s; }
+
 #endif //CORE_H
diff --git a/uppsrc/CtrlCore/lay.h b/uppsrc/CtrlCore/lay.h
index 15d739417..c6edc7c37 100644
--- a/uppsrc/CtrlCore/lay.h
+++ b/uppsrc/CtrlCore/lay.h
@@ -14,7 +14,7 @@
 
 #define LAYOUT(name, x, y)       template<class T> \
 	                             struct With##name : public T, public name##__layid { \
-										static UPP::Size GetLayoutSize() { return UPP::Ctrl::LayoutZoom(x, y); }
+										static Upp::Size GetLayoutSize() { return Upp::Ctrl::LayoutZoom(x, y); }
 #define UNTYPED(variable, param)
 #define ITEM(classname, var, param)     classname var;
 #define END_LAYOUT               };
@@ -27,7 +27,7 @@
 #undef  END_LAYOUT
 
 #define LAYOUT(nm, x, y)       template<class T> inline void SetLayout_##nm(T& parent, bool add = false, bool show = false) { \
-                                  SetLayout_Size(parent, Zx(x), Zy(y));
+                                  SetLayout_Size(parent, Upp::Zx(x), Upp::Zy(y));
 #define UNTYPED(var, param)       parent.var.param; if(add) parent.Add(parent.var); if(show) parent.var.Show();
 #define ITEM(clss, var, param)    UNTYPED(var, param);
 #define END_LAYOUT             }
@@ -40,7 +40,7 @@
 #undef  END_LAYOUT
 
 #define LAYOUT(nm, x, y)       template<class T, class D> inline void SetLayout_##nm(T& ctrl, D& parent, bool add = false, bool show = false) { \
-                                  SetLayout_Size(ctrl, Zx(x), Zy(y));
+                                  SetLayout_Size(ctrl, Upp::Zx(x), Upp::Zy(y));
 #define UNTYPED(var, param)       parent.var.param; if(add) ctrl.Add(parent.var); if(show) parent.var.Show();
 #define ITEM(clss, var, param)    UNTYPED(var, param);
 #define END_LAYOUT             }
diff --git a/uppsrc/ide/UppHub.cpp b/uppsrc/ide/UppHub.cpp
index f76b83b6e..77b402b05 100644
--- a/uppsrc/ide/UppHub.cpp
+++ b/uppsrc/ide/UppHub.cpp
@@ -164,7 +164,7 @@ void UppHubDlg::Menu(Bar& bar)
 		}
 		Install(names);
 	});
-	bar.Add("Reinstall everything..", [=] {
+	bar.Add("Reinstall all..", [=] {
 		Index<String> names;
 		for(const UppHubNest& n : upv)
 			if(DirectoryExists(hubdir + "/" + n.name))