Fix gps, minor fixes