Slightly improve bnode handling