couple of bidi fixes