Assorted fixes to crops