CONN-443: Fix for issues found while regression testing.