Fix up some image cropping