Fix parallel builds in master build