Merge "Various location fixes"