some fixes for parallel runs