Fixing RTL issues