Fix of scheduling macros for simulators signatures