Fix gps monitor issues