more rtl fixes