Bugfixes, location support