More location fixes.