Fix gmap issues.