Fixes for Right To Left mode