Minors changes

Some minors changes to reflect more MongoDB Server