CONN-443: fixes for errors in regression suites.