diff --git a/include/c99/stdbool.h b/include/c99/stdbool.h
index 99a735d..99af1a0 100644
--- a/include/c99/stdbool.h
+++ b/include/c99/stdbool.h
@@ -35,7 +35,8 @@
 #define bool    _Bool
 
 /* For compilers that don't have the builtin _Bool type. */
-#if defined(_MSC_VER) || (__STDC_VERSION__ < 199901L && __GNUC__ < 3)
+#if (defined(_MSC_VER) && _MSC_VER < 1800) || \
+    (defined __GNUC__&& __STDC_VERSION__ < 199901L && __GNUC__ < 3)
 typedef unsigned char _Bool;
 #endif
 
diff --git a/src/mesa/main/querymatrix.c b/src/mesa/main/querymatrix.c
index 2843d55..6c456ab 100644
--- a/src/mesa/main/querymatrix.c
+++ b/src/mesa/main/querymatrix.c
@@ -37,6 +37,7 @@
 #define FLOAT_TO_FIXED(x) ((GLfixed) ((x) * 65536.0))
 
 #if defined(_MSC_VER)
+#if _MSC_VER < 1800  /* Not required on VS2013 and above. */
 /* Oddly, the fpclassify() function doesn't exist in such a form
  * on MSVC.  This is an implementation using slightly different
  * lower-level Windows functions.
@@ -69,6 +70,7 @@
             return FP_NAN;
     }
 }
+#endif  /* _MSC_VER < 1800 */
 
 #elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \
      defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index ef51479..57058ab 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -1330,8 +1330,8 @@
                    colorType == GL_FLOAT);
 
             /* set span->array->rgba to colors for renderbuffer's datatype */
-            if (span->array->ChanType != colorType) {
-               convert_color_type(span, colorType, 0);
+            if (span->array->ChanType != colorType || multiFragOutputs) {
+               convert_color_type(span, colorType, buf);
             }
             else {
                if (span->array->ChanType == GL_UNSIGNED_BYTE) {