Fixing location bugs