BSON format corrections