diff --git a/rEFIt_UEFI/cpp_foundation/XStringW.cpp b/rEFIt_UEFI/cpp_foundation/XStringW.cpp
index 42b87b588..8a7c89000 100755
--- a/rEFIt_UEFI/cpp_foundation/XStringW.cpp
+++ b/rEFIt_UEFI/cpp_foundation/XStringW.cpp
@@ -114,6 +114,7 @@ const XStringW& XStringW::takeValueFrom(const wchar_t* S)
 {
 	if ( S ) return takeValueFrom(S, wcslen(S));
 	Init(0);
+        return *this;
 }
 
 const XStringW& XStringW::takeValueFrom(const char* S)
diff --git a/rEFIt_UEFI/refit/menu.cpp b/rEFIt_UEFI/refit/menu.cpp
index 83cedfc0e..abe522b98 100644
--- a/rEFIt_UEFI/refit/menu.cpp
+++ b/rEFIt_UEFI/refit/menu.cpp
@@ -2042,6 +2042,7 @@ VOID REFIT_MENU_SCREEN::InitScroll(IN INTN ItemCount, IN UINTN MaxCount,
 
   ScrollState.LastVisible = ScrollState.FirstVisible + ScrollState.MaxVisible;
 
+#if USE_XTHEME
   //scroll bar geometry
   if (!ThemeX.TypeSVG) {
     UpButton.Width      = ThemeX.ScrollWidth; // 16
@@ -2063,6 +2064,7 @@ VOID REFIT_MENU_SCREEN::InitScroll(IN INTN ItemCount, IN UINTN MaxCount,
     ScrollStart.Height  = 0; // 7
     ScrollEnd.Height    = 0;
   }
+#endif
 
 }