A few tweaks to connection