diff --git a/rtengine/eahd_demosaic.cc b/rtengine/eahd_demosaic.cc
index aef016386..4ebeb2d66 100644
--- a/rtengine/eahd_demosaic.cc
+++ b/rtengine/eahd_demosaic.cc
@@ -206,7 +206,7 @@ inline void RawImageSource::interpolate_row_rb (float* ar, float* ab, float* pg,
             n++;
         }
 
-        nonGreen2[j] = cg[j] + nonGreen / n;
+        nonGreen2[j] = cg[j] + nonGreen / std::max(n, 1);
     }
 }
 
diff --git a/rtgui/filebrowser.cc b/rtgui/filebrowser.cc
index f83e39146..8a508c747 100644
--- a/rtgui/filebrowser.cc
+++ b/rtgui/filebrowser.cc
@@ -127,9 +127,7 @@ void findOriginalEntries (const std::vector<ThumbBrowserEntryBase*>& entries)
 
 FileBrowser::FileBrowser () :
     menuLabel(nullptr),
-#ifdef WIN32
     miOpenDefaultViewer(nullptr),
-#endif
     selectDF(nullptr),
     thisIsDF(nullptr),
     autoDF(nullptr),