Fixes for bugs in RBNF