Fixed issues with Location objects