Fixed some GPS bugs found in first test