Bugfixes for Location fields