Parallel build fixes