diff --git a/darwin/areaevents.m b/darwin/areaevents.m
index b5e7dab6..d7ceaaad 100644
--- a/darwin/areaevents.m
+++ b/darwin/areaevents.m
@@ -1,5 +1,5 @@
 // 30 march 2014
-#include "uipriv_darwin.h"
+#import "uipriv_darwin.h"
 
 /*
 Mac OS X uses its own set of hardware key codes that are different from PC keyboard scancodes, but are positional (like PC keyboard scancodes). These are defined in <HIToolbox/Events.h>, a Carbon header. As far as I can tell, there's no way to include this header without either using an absolute path or linking Carbon into the program, so the constant values are used here instead.
diff --git a/darwin/combobox.m b/darwin/combobox.m
index 0d38910a..6789c834 100644
--- a/darwin/combobox.m
+++ b/darwin/combobox.m
@@ -1,5 +1,5 @@
 // 14 august 2015
-#include "uipriv_darwin.h"
+#import "uipriv_darwin.h"
 
 // NSComboBoxes have no intrinsic width; we'll use the default Interface Builder width for them.
 // NSPopUpButton is fine.
diff --git a/test/drawtests.c b/test/drawtests.c
index e1abc121..1730a95e 100644
--- a/test/drawtests.c
+++ b/test/drawtests.c
@@ -191,8 +191,6 @@ static void d2dColorToRGB(uint32_t color, double *r, double *g, double *b)
 #define d2dWhite 0xFFFFFF
 #define d2dYellowGreen 0x9ACD32
 #define d2dYellow 0xFFFF00
-// TODO this color appears wrong on Vista for some reason... either that or the gradients aren't working right
-// TODO the gradients don't work on OS X
 #define d2dForestGreen 0x228B22
 #define d2dOliveDrab 0x6B8E23
 #define d2dLightSkyBlue 0x87CEFA
@@ -352,7 +350,7 @@ static void drawD2DLinearBrush(uiAreaDrawParams *p)
 	stops[0].Pos = 0.0;
 	d2dColorToRGB(d2dYellow, &(stops[0].R), &(stops[0].G), &(stops[0].B));
 	stops[0].A = 1.0;
-	stops[1].Pos = 10;
+	stops[1].Pos = 1.0;
 	d2dColorToRGB(d2dForestGreen, &(stops[1].R), &(stops[1].G), &(stops[1].B));
 	stops[1].A = 1.0;
 	gradient.Stops = stops;
@@ -395,7 +393,7 @@ static void drawD2DRadialBrush(uiAreaDrawParams *p)
 	stops[0].Pos = 0.0;
 	d2dColorToRGB(d2dYellow, &(stops[0].R), &(stops[0].G), &(stops[0].B));
 	stops[0].A = 1.0;
-	stops[1].Pos = 10;
+	stops[1].Pos = 1.0;
 	d2dColorToRGB(d2dForestGreen, &(stops[1].R), &(stops[1].G), &(stops[1].B));
 	stops[1].A = 1.0;
 	gradient.Stops = stops;
@@ -450,7 +448,7 @@ static void drawD2DPathGeometries(uiAreaDrawParams *p)
 	stops[0].Pos = 0.0;
 	d2dColorToRGB(d2dYellow, &(stops[0].R), &(stops[0].G), &(stops[0].B));
 	stops[0].A = 1.0;
-	stops[1].Pos = 10;
+	stops[1].Pos = 1.0;
 	d2dColorToRGB(d2dForestGreen, &(stops[1].R), &(stops[1].G), &(stops[1].B));
 	stops[1].A = 1.0;
 	radial.Stops = stops;