Updates for parallel build