Parallel make: additional fixes