fixes after RTL refactoring