Fix connection location bugs.