Fixed a few things with location manager