fix FastSim and Validation