more adjusts for mongodb 2.4.9