CDRIVER-360 fixups after first review