Connection fixes