Small fixes for Right To Left