More locations fixes