Fixes for older issues

Fixes #478
Fixes #599
Added rare components to foraging