CONN-443: Fixes for issues found in regression test.