Parallel make fixes