[ADD] rtl fixes