Various minor fixes

Note: Adding strawberry shrubs breaks savegame compatibility.