Parallel build fixes

@wsnipex