Fixes for parallel running