Fix some more locations