diff --git a/vncviewer/DesktopWindow.cxx b/vncviewer/DesktopWindow.cxx
index 63b72d9bc..720f69c53 100644
--- a/vncviewer/DesktopWindow.cxx
+++ b/vncviewer/DesktopWindow.cxx
@@ -837,7 +837,6 @@ int DesktopWindow::handle(int event)
   case FL_DRAG:
   case FL_MOVE:
     // We don't get FL_LEAVE with a grabbed pointer, so check manually
-    // FIXME: Doesn't seem to work with window caption?
     if (mouseGrabbed) {
       if ((Fl::event_x() < 0) || (Fl::event_x() >= w()) ||
           (Fl::event_y() < 0) || (Fl::event_y() >= h())) {
diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx
index 2cc99c357..f3cdb5294 100644
--- a/vncviewer/Viewport.cxx
+++ b/vncviewer/Viewport.cxx
@@ -626,7 +626,6 @@ void Viewport::handleKeyPress(int systemKeyCode,
   if (!hotKeyBypass) {
     HotKeyHandler::KeyAction action;
 
-    // FIXME: Detection broken on macOS after Cmd+Tab
     action = hotKeyHandler.handleKeyPress(systemKeyCode, keySym);
 
     if (action == HotKeyHandler::KeyIgnore) {
@@ -699,7 +698,6 @@ void Viewport::handleKeyPress(int systemKeyCode,
                            "with the server:\n\n%s"), e.str());
       }
 
-      // FIXME: We get weird keysyms on macOS
       switch (keySym) {
       case XK_G:
       case XK_g: