Include the bug fixes by Oliver in the TR simulation

No match.