Redo some of the misplaces changes for mongodb2.4