Fix rajcrop bugs