diff --git a/reactos/base/shell/explorer/trayntfy.cpp b/reactos/base/shell/explorer/trayntfy.cpp
index adc5ae05361..f4a79f79a57 100644
--- a/reactos/base/shell/explorer/trayntfy.cpp
+++ b/reactos/base/shell/explorer/trayntfy.cpp
@@ -82,7 +82,7 @@ public:
         return -1;
     }
 
-    VOID AddButton(IN CONST NOTIFYICONDATA *iconData)
+    BOOL AddButton(IN CONST NOTIFYICONDATA *iconData)
     {
         TBBUTTON tbBtn;
         NOTIFYICONDATA * notifyItem;
@@ -91,8 +91,7 @@ public:
         int index = FindItemByIconData(iconData, &notifyItem);
         if (index >= 0)
         {
-            UpdateButton(iconData);
-            return;
+            return UpdateButton(iconData);
         }
 
         notifyItem = new NOTIFYICONDATA();
@@ -138,9 +137,11 @@ public:
 
         CToolbar::AddButton(&tbBtn);
         SetButtonSize(ICON_SIZE, ICON_SIZE);
+
+        return TRUE;
     }
 
-    VOID UpdateButton(IN CONST NOTIFYICONDATA *iconData)
+    BOOL UpdateButton(IN CONST NOTIFYICONDATA *iconData)
     {
         NOTIFYICONDATA * notifyItem;
         TBBUTTONINFO tbbi = { 0 };
@@ -148,8 +149,7 @@ public:
         int index = FindItemByIconData(iconData, &notifyItem);
         if (index < 0)
         {
-            AddButton(iconData);
-            return;
+            return AddButton(iconData);
         }
 
         tbbi.cbSize = sizeof(tbbi);
@@ -197,15 +197,17 @@ public:
         /* TODO: support NIF_INFO, NIF_GUID, NIF_REALTIME, NIF_SHOWTIP */
 
         SetButtonInfo(index, &tbbi);
+
+        return TRUE;
     }
 
-    VOID RemoveButton(IN CONST NOTIFYICONDATA *iconData)
+    BOOL RemoveButton(IN CONST NOTIFYICONDATA *iconData)
     {
         NOTIFYICONDATA * notifyItem;
 
         int index = FindItemByIconData(iconData, &notifyItem);
         if (index < 0)
-            return;
+            return FALSE;
 
         DeleteButton(index);
 
@@ -215,6 +217,8 @@ public:
         }
 
         delete notifyItem;
+
+        return TRUE;
     }
 
     VOID GetTooltipText(int index, LPTSTR szTip, DWORD cchTip)
@@ -432,20 +436,11 @@ public:
             switch (data->notify_code)
             {
             case NIM_ADD:
-            {
-                Toolbar.AddButton(iconData);
-                break;
-            }
+                return Toolbar.AddButton(iconData);
             case NIM_MODIFY:
-            {
-                Toolbar.UpdateButton(iconData);
-                break;
-            }
+                return Toolbar.UpdateButton(iconData);
             case NIM_DELETE:
-            {
-                Toolbar.RemoveButton(iconData);
-                break;
-            }
+                return Toolbar.RemoveButton(iconData);
             default:
                 TRACE("NotifyMessage received with unknown code %d.\n", data->notify_code);
                 break;
diff --git a/reactos/base/shell/rshell/CMenuDeskBar.cpp b/reactos/base/shell/rshell/CMenuDeskBar.cpp
index d068283d54c..b5e113a5be4 100644
--- a/reactos/base/shell/rshell/CMenuDeskBar.cpp
+++ b/reactos/base/shell/rshell/CMenuDeskBar.cpp
@@ -338,6 +338,8 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::Popup(POINTL *ppt, RECTL *prcExclude, MP
         x = ppt->x + rc.left;
         y = ppt->y + rc.top;
         break;
+    case MPPF_TOP:
+        break;
     case MPPF_TOP | MPPF_ALIGN_LEFT:
         x = ppt->x - rc.right;
         y = ppt->y + rc.top;
diff --git a/reactos/dll/shellext/stobject/lang/ro-RO.rc b/reactos/dll/shellext/stobject/lang/ro-RO.rc
index 4c74b1504bc..00b92859ab5 100644
--- a/reactos/dll/shellext/stobject/lang/ro-RO.rc
+++ b/reactos/dll/shellext/stobject/lang/ro-RO.rc
@@ -1,6 +1,7 @@
 /* Ștefan Fulea (stefan dot fulea at mail dot md) */
 LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
 
+#if 0
 IDD_POWER_METER DIALOGEX 0, 0, 252, 218
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
@@ -12,6 +13,7 @@ BEGIN
     CONTROL "Afișează detalii pentru fiecare &baterie.", 1003, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 135, 6, 120, 8 
     CONTROL "", 1000, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 11, 29, 229, 178 
 END
+#endif
 
 STRINGTABLE
 BEGIN