Connection level fixes.