Fixing up GPS