further rtl fixes