location bugfixes