Final modifications to be able to run on FastSim