Downscaling fixes