Small Fixes on Location Manager logic