Further fixes to GPS