More minor tweaks to ConnectionManager