Small bugfixes related to repeating runs.