Fixes to the connection