Mongo updates

Sync up with mongo client API and ensure tests pass.