diff --git a/TODO b/TODO
index 8180c5a7..68c2d928 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,25 @@
+- test nip2 icc_import ... had problems?
+ 
+  test with ~/Desktop/OHHFN.png
+
+- add a test suite test for vips_shrink with non-int args
+
+- we have Vips.leak_set() and Vips.cache_set_trace() ... stupid! make
+  everything Vips.set_thing()
+
+- build-win32 should also generate def/lib files
+
+- convert float mask to int for int convolution has rounding problems
+
+  we do rint() all elements, and rint(scale)
+
+  we ought to sum all float elements and take the ratio of the scale to the sum
+
+  then rint all elements, sum, and scale the sum by the ratio to get the int
+  scale
+
+  same for offset
+
 - recent imagemagick seems to have link problems
 
   see:
diff --git a/libvips/foreign/foreign.c b/libvips/foreign/foreign.c
index 2c90622a..a6b613c1 100644
--- a/libvips/foreign/foreign.c
+++ b/libvips/foreign/foreign.c
@@ -1284,25 +1284,57 @@ vips_foreign_convert_saveable( VipsForeignSave *save )
 		 */
 	}
 
-	/* Shift down to 8 bits. Handy for 8-bit-only formats like jpeg.
+	/* Handle the ushort interpretations.
 	 *
-	 * If the operation wants to write 8 bits for this format and this
-	 * image is 16 bits or more and Type is RGB16 or GREY16 ...
-	 * automatically shift down.
+	 * RGB16 and GREY16 use 0-65535 for black-white. If we have an image
+	 * tagged like this, and it has more than 8 bits (we leave crazy uchar
+	 * images tagged as RGB16 alone), we'll need to get it ready for the
+	 * saver.
 	 */
-	if( vips_band_format_is8bit( class->format_table[in->BandFmt] ) &&
-		!vips_band_format_is8bit( in->BandFmt ) &&
-		(in->Type == VIPS_INTERPRETATION_RGB16 ||
-			in->Type == VIPS_INTERPRETATION_GREY16) ) {
-		VipsImage *out;
+	if( (in->Type == VIPS_INTERPRETATION_RGB16 ||
+		 in->Type == VIPS_INTERPRETATION_GREY16) &&
+		!vips_band_format_is8bit( in->BandFmt ) ) {
+		/* If the saver supports ushort, cast to ushort. It may be
+		 * float at the moment, for example.
+		 *
+		 * If the saver does not support ushort, automatically shift
+		 * it down. This is the behaviour we want for saving an RGB16
+		 * image as JPG, for example.
+		 */
+		if( class->format_table[VIPS_FORMAT_USHORT] == 
+			VIPS_FORMAT_USHORT ) {
+			VipsImage *out;
 
-		if( vips_rshift_const1( in, &out, 8, NULL ) ) { 
+			if( vips_cast( in, &out, VIPS_FORMAT_USHORT, NULL ) ) {
+				g_object_unref( in );
+				return( -1 );
+			}
 			g_object_unref( in );
-			return( -1 );
-		}
-		g_object_unref( in );
 
-		in = out;
+			in = out;
+		}
+		else {
+			VipsImage *out;
+
+			if( vips_rshift_const1( in, &out, 8, NULL ) ) { 
+				g_object_unref( in );
+				return( -1 );
+			}
+			g_object_unref( in );
+
+			in = out;
+
+			/* That could have produced an int image ... make sure 
+			 * we are now uchar.
+			 */
+			if( vips_cast( in, &out, VIPS_FORMAT_UCHAR, NULL ) ) {
+				g_object_unref( in );
+				return( -1 );
+			}
+			g_object_unref( in );
+
+			in = out;
+		}
 	}
 
 	/* Cast to the output format.
diff --git a/libvips/resample/shrink.c b/libvips/resample/shrink.c
index e1dbb0c1..3ac8c8e5 100644
--- a/libvips/resample/shrink.c
+++ b/libvips/resample/shrink.c
@@ -67,7 +67,6 @@ G_DEFINE_TYPE( VipsShrink, vips_shrink, VIPS_TYPE_RESAMPLE );
 static int
 vips_shrink_build( VipsObject *object )
 {
-	VipsObjectClass *class = VIPS_OBJECT_GET_CLASS( object );
 	VipsResample *resample = VIPS_RESAMPLE( object );
 	VipsShrink *shrink = (VipsShrink *) object;
 	VipsImage **t = (VipsImage **)