Slight fixes to ConnectionManager