Fixing crop and saturation bugs