Fixed cropping bugs