A number of fixes affecting image resizing/cropping/resetting