NearMe fixes