Little corrections in simulator