some fixes for RTL