small nbdody 6++ fixes