Fixes in Simulation module.