minor fixes and adaptations to new interfaces
minor fixes and adaptations to new interfaces

FastAndFurious/simulator,FastAndFurious/simulator,FastAndFurious/fnf.simulator,FastAndFurious/fnf.simulator,FastAndFurious/fnf.simulator,FastAndFurious/simulator,FastAndFurious/fnf.simulator,FastAndFurious/simulator