Fix locations