More fixes to the RTL. Disabling more tests for now.