diff --git a/src/fmenu.cpp b/src/fmenu.cpp
index 0e5c09b9..a7d1ff7d 100644
--- a/src/fmenu.cpp
+++ b/src/fmenu.cpp
@@ -628,12 +628,12 @@ void FMenu::drawItems()
       {
         FString accel_name (getKeyName(accel_key));
         int accel_len = int(accel_name.getLength());
-        int len = maxItemWidth - (to_char + accel_len + c + 2);
+        int len = int(maxItemWidth) - (to_char + accel_len + c + 2);
         if ( len > 0 )
         {
           FString spaces (len, wchar_t(' '));
           print (spaces + accel_name);
-          to_char = maxItemWidth - (c + 2);
+          to_char = int(maxItemWidth) - (c + 2);
         }
       }
 
diff --git a/src/fmenubar.cpp b/src/fmenubar.cpp
index e72b9d80..de12e5e1 100644
--- a/src/fmenubar.cpp
+++ b/src/fmenubar.cpp
@@ -446,9 +446,6 @@ void FMenuBar::adjustSize()
 void FMenuBar::leaveMenuBar()
 {
   resetMenu();
-  if ( hasSelectedItem() )
-    getSelectedItem()->unsetSelected();
-  setSelectedItem(0);
   redraw();
   activatePrevWindow();
   getActiveWindow()->getFocusWidget()->setFocus();
diff --git a/src/fwidget.cpp b/src/fwidget.cpp
index f0f577c5..e5739152 100644
--- a/src/fwidget.cpp
+++ b/src/fwidget.cpp
@@ -1885,7 +1885,7 @@ void FWidget::drawShadow()
   {
     if ( x2 < xmax )
     {
-      uInt block;
+      int block;
       gotoxy (x2+1, y1);
       ch = getCoveredCharacter (x2+1, y1, this);
       setColor (wc.shadow_fg, ch.bg_color);