Fixes for RTL mode