Fixes to Connection