Fix more rtl