Fix connection problems