Fixing location bugs.