ConnectionManager fixes