Improvements to image formatting.