Some fixes in simulation activity