Fixes bugs on messaging and geolocation