Some more image.c fixes.