Fix location and more