More fixes on multiple runnings