diff --git a/COMPILE.txt b/COMPILE.txt
index 8716d9a08..ca92350d8 100644
--- a/COMPILE.txt
+++ b/COMPILE.txt
@@ -121,7 +121,7 @@ WINDOWS
     INSTALL THE TOOLCHAIN
       - TDM-GCC On-Demand Installer
           http://tdm-gcc.tdragon.net/download
-        GCC 4.7 is recommended, as under some conditions older
+        GCC 4.9 is recommended for Win64 builds, as under some conditions older
         versions of GCC can cause artifacts.
         Download the "tdm-gcc-webdl" option. Run it, select "Create a new
         TDM-GCC installation" and choose the appropriate option for your
diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc
index c9ca9c225..c576e6efe 100644
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -1195,7 +1195,7 @@ void batchProcessingThread (ProcessingJob* job, BatchProcessingListener* bpl, bo
 void startBatchProcessing (ProcessingJob* job, BatchProcessingListener* bpl, bool tunnelMetaData) {
 
     if (bpl)
-#if __GNUC__ == 4 && __GNUC_MINOR__ >= 8 && defined( WIN32 ) && defined(__x86_64__)
+#if __GNUC__ == 4 && __GNUC_MINOR__ == 8 && defined( WIN32 ) && defined(__x86_64__)
 		// See Issue 2384 "Very bad response time on win7/64 using gcc 4.8 when queue is running"
         Glib::Thread::create(sigc::bind(sigc::ptr_fun(batchProcessingThread), job, bpl, tunnelMetaData), 0, true, true, Glib::THREAD_PRIORITY_NORMAL);
 #else
diff --git a/rtgui/bqentryupdater.cc b/rtgui/bqentryupdater.cc
index 8f7abb643..44395c8ff 100644
--- a/rtgui/bqentryupdater.cc
+++ b/rtgui/bqentryupdater.cc
@@ -68,7 +68,7 @@ void BatchQueueEntryUpdater::process (guint8* oimg, int ow, int oh, int newh, BQ
         stopped = false;
         tostop  = false;
 
-#if __GNUC__ == 4 && __GNUC_MINOR__ >= 8 && defined( WIN32 ) && defined(__x86_64__)
+#if __GNUC__ == 4 && __GNUC_MINOR__ == 8 && defined( WIN32 ) && defined(__x86_64__)
 		#undef THREAD_PRIORITY_NORMAL
 		// See Issue 2384 comment #3
 		thread = Glib::Thread::create(sigc::mem_fun(*this, &BatchQueueEntryUpdater::processThread), (unsigned long int)0, true, true, Glib::THREAD_PRIORITY_NORMAL);
diff --git a/rtgui/filebrowserentry.cc b/rtgui/filebrowserentry.cc
index 1e3976019..7953bb327 100644
--- a/rtgui/filebrowserentry.cc
+++ b/rtgui/filebrowserentry.cc
@@ -206,7 +206,7 @@ void FileBrowserEntry::updateImage (rtengine::IImage8* img, double scale, rtengi
     param->img = img;
     param->scale = scale;
     param->cropParams = cropParams;
-#if __GNUC__ == 4 && __GNUC_MINOR__ >= 8 && defined( WIN32 ) && defined(__x86_64__)
+#if __GNUC__ == 4 && __GNUC_MINOR__ == 8 && defined( WIN32 ) && defined(__x86_64__)
     g_idle_add_full (G_PRIORITY_DEFAULT, updateImageUI, param, NULL);
 #else
     g_idle_add_full (G_PRIORITY_LOW, updateImageUI, param, NULL);
diff --git a/rtgui/thumbimageupdater.cc b/rtgui/thumbimageupdater.cc
index 07b569b8c..03ae89da3 100644
--- a/rtgui/thumbimageupdater.cc
+++ b/rtgui/thumbimageupdater.cc
@@ -68,11 +68,11 @@ public:
 		active_(0),
 		inactive_waiting_(false)
 	{
-		int threadCount=1;
-#if !(defined( WIN32 ) && defined( __x86_64__ ))
+		int threadCount = 1;
+#if !(__GNUC__ == 4 && __GNUC_MINOR__ == 8 && defined( WIN32 ) && defined(__x86_64__))
 		// See Issue 2431 for explanation
 		#ifdef _OPENMP
-			threadCount=omp_get_num_procs();
+			threadCount = omp_get_num_procs();
 		#endif
 #endif