more fixes to bson splitting