Add some missing bidi support