more image scale fixes