A bunch of different changes for rtl support