Fixed some of connectionmanager