More tweaking for BNodes