Fixes
Locations and actions