Some fixes for foraging