Added RTL fixes to resolve #3