Merge: lib/mongodb: minor fixes