Fix some crop bugs