Fix some handling in bn_word. This also resolves the issues observed in