Minor fixes to support latest version of MongoDB C driver