Fix location change issues