More tweaks towards getting GPS to work...