Merge "Misc tidy up before adding geolocation classes"