Corrections on MatchGPS to make Validation work