Fix other locations too