added rtl fixes