Fix activity and gpx errors