Bugfixes for -j > 1