CR Fixes, location manager refactoring