Mob 654 fixes for rtl

@bkoval plase have a look!