CConnectionManager: even more tweaks