Fix RTL issues