diff --git a/base/shell/rshell/CMenuBand.cpp b/base/shell/rshell/CMenuBand.cpp
index e267bd56a20..58e4e9dc0dc 100644
--- a/base/shell/rshell/CMenuBand.cpp
+++ b/base/shell/rshell/CMenuBand.cpp
@@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand);
 extern "C"
 HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv)
 {
+    HRESULT hr;
 #if USE_SYSTEM_MENUBAND
     hr = CoCreateInstance(CLSID_MenuBand,
         NULL,
@@ -48,13 +49,13 @@ HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv)
     if (!site)
         return E_OUTOFMEMORY;
 
-    HRESULT hr = site->QueryInterface(riid, ppv);
+    hr = site->QueryInterface(riid, ppv);
 
     if (FAILED_UNEXPECTEDLY(hr))
         site->Release();
+#endif
 
     return hr;
-#endif
 }
 
 CMenuBand::CMenuBand() :
@@ -308,6 +309,7 @@ HRESULT STDMETHODCALLTYPE CMenuBand::OnPosRectChangeDB(RECT *prc)
 
     return S_OK;
 }
+
 HRESULT STDMETHODCALLTYPE  CMenuBand::GetBandInfo(
     DWORD dwBandID,
     DWORD dwViewMode,
@@ -337,20 +339,20 @@ HRESULT STDMETHODCALLTYPE  CMenuBand::GetBandInfo(
 
     if (m_dwFlags & SMINIT_VERTICAL)
     {
-        pdbi->ptMinSize.x = max(minStatic.cx, minStatic.cx) + 20;
-        pdbi->ptMinSize.y = minStatic.cy + minStatic.cy;
+        pdbi->ptMinSize.x = max(minStatic.cx, minShlFld.cx) + 20;
+        pdbi->ptMinSize.y = minStatic.cy + minShlFld.cy;
         pdbi->ptMaxSize.x = max(maxStatic.cx, maxShlFld.cx) + 20;
         pdbi->ptMaxSize.y = maxStatic.cy + maxShlFld.cy;
         pdbi->dwModeFlags = DBIMF_VARIABLEHEIGHT;
     }
     else
     {
-        pdbi->ptMinSize.x = minStatic.cx + minStatic.cx;
-        pdbi->ptMinSize.y = max(minStatic.cy, minStatic.cy);
+        pdbi->ptMinSize.x = minStatic.cx + minShlFld.cx;
+        pdbi->ptMinSize.y = max(minStatic.cy, minShlFld.cy);
         pdbi->ptMaxSize.x = maxStatic.cx + maxShlFld.cx;
         pdbi->ptMaxSize.y = max(maxStatic.cy, maxShlFld.cy);
     }
-    pdbi->ptIntegral.x = max(intStatic.cx, intStatic.cx);
+    pdbi->ptIntegral.x = max(intStatic.cx, intShlFld.cx);
     pdbi->ptIntegral.y = max(intStatic.cy, intShlFld.cy);
     pdbi->ptActual = pdbi->ptMinSize;
 
@@ -469,7 +471,7 @@ HRESULT STDMETHODCALLTYPE CMenuBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdI
             {
                 _KeyboardItemChange(VK_HOME);
             }
-            else if (nCmdexecopt == -2) // last
+            else // last
             {
                 _KeyboardItemChange(VK_END);
             }
diff --git a/base/shell/rshell/CMenuDeskBar.cpp b/base/shell/rshell/CMenuDeskBar.cpp
index c2f0f0aa4d0..ad07d2b7b9b 100644
--- a/base/shell/rshell/CMenuDeskBar.cpp
+++ b/base/shell/rshell/CMenuDeskBar.cpp
@@ -30,6 +30,7 @@ const static GUID CGID_MenuDeskBar = { 0x5C9F0A12, 0x959E, 0x11D0, { 0xA3, 0xA4,
 extern "C"
 HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv)
 {
+    HRESULT hr;
 #if USE_SYSTEM_MENUDESKBAR
     hr = CoCreateInstance(CLSID_MenuDeskBar,
         NULL,
@@ -43,13 +44,13 @@ HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv)
     if (!deskbar)
         return E_OUTOFMEMORY;
 
-    HRESULT hr = deskbar->QueryInterface(riid, ppv);
+    hr = deskbar->QueryInterface(riid, ppv);
 
     if (FAILED_UNEXPECTEDLY(hr))
         deskbar->Release();
 
-    return hr;
 #endif
+    return hr;
 }
 
 CMenuDeskBar::CMenuDeskBar() :
diff --git a/base/shell/rshell/CMenuSite.cpp b/base/shell/rshell/CMenuSite.cpp
index 718458504eb..791377db285 100644
--- a/base/shell/rshell/CMenuSite.cpp
+++ b/base/shell/rshell/CMenuSite.cpp
@@ -28,6 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(menusite);
 extern "C"
 HRESULT WINAPI CMenuSite_Constructor(REFIID riid, LPVOID *ppv)
 {
+    HRESULT hr;
 #if USE_SYSTEM_MENUSITE
     hr = CoCreateInstance(CLSID_MenuBandSite,
         NULL,
@@ -41,13 +42,13 @@ HRESULT WINAPI CMenuSite_Constructor(REFIID riid, LPVOID *ppv)
     if (!site)
         return E_OUTOFMEMORY;
 
-    HRESULT hr = site->QueryInterface(riid, ppv);
+    hr = site->QueryInterface(riid, ppv);
 
     if (FAILED_UNEXPECTEDLY(hr))
         site->Release();
+#endif
 
     return hr;
-#endif
 }
 
 CMenuSite::CMenuSite() :