MonoDB Fixes

Additional fixes in place for MongoDB support.