More BSON namespace fix