Slight improvements to image output.