Misc image formatting updates