More ConnectionManager tweaks