Fixes for RTL

Submitted by Mary Evans