Fixes for Location