more gps fixes