Various fixes to crop loot