Minor fixes to connection class/header