Merge "Fix a couple of bugs from the location overhaul." into jb-mr1-dev