Fixes added to make the slow simulation running with the current HEAD (from M. Masera)

No match.