Fix some issues with image output.