Connection fixes.