More fixups for RTL