[FOLD] More simulator fixes