Minor changes in ConnectionManager