Fix more location references