CONN-446: Fix for validation suite failures.