More RTL fixes