Correct template locations