Various changes to get Rhythm working in integration test.