more fixes for connection and manager