Hotfix 17/4

- Fixed issue where last patch caused bakery and pigsty to stop working.
- Fixed issue with Wind caused by last patch.