Fixed gps problems