Rtl fixes

issue #44