Fix locations

cc @joshuatobin