small RTL fix and code review feedback