diff --git a/src/d3d/rwd3d.h b/src/d3d/rwd3d.h
index 36e94f3..2e4996c 100644
--- a/src/d3d/rwd3d.h
+++ b/src/d3d/rwd3d.h
@@ -1,5 +1,5 @@
 #ifdef RW_D3D9
-#define NOMINMAX
+#define NOMINMAX 1
 #include <d3d9.h>
 #endif
 
diff --git a/tools/clumpview/ras_test.cpp b/tools/clumpview/ras_test.cpp
index 03621dc..853e10e 100644
--- a/tools/clumpview/ras_test.cpp
+++ b/tools/clumpview/ras_test.cpp
@@ -465,11 +465,11 @@ texfunc(Color t, Color f)
 		a = srTexUseAlpha ? t.a : f.a;
 		break;
 	}
-	r = clamp(r);
-	g = clamp(g);
-	b = clamp(b);
-	a = clamp(a);
-	Color v = { r, g, b, a };
+	Color v;
+	v.r = clamp(r);
+	v.g = clamp(g);
+	v.b = clamp(b);
+	v.a = clamp(a);
 	return v;
 }
 
diff --git a/tools/imguitest/main.cpp b/tools/imguitest/main.cpp
index 9f5b348..5051b54 100644
--- a/tools/imguitest/main.cpp
+++ b/tools/imguitest/main.cpp
@@ -74,7 +74,7 @@ Draw(float timeDelta)
 	static bool show_another_window = false;
 	static ImVec4 clear_color = ImVec4(0.45f, 0.55f, 0.60f, 1.00f);
 
-	rw::RGBA clearcol = { clear_color.x*255, clear_color.y*255, clear_color.z*255, clear_color.w*255 };
+	rw::RGBA clearcol = rw::makeRGBA(clear_color.x*255, clear_color.y*255, clear_color.z*255, clear_color.w*255);
 	Scene.camera->clear(&clearcol, rw::Camera::CLEARIMAGE|rw::Camera::CLEARZ);
 	Scene.camera->beginUpdate();