Tweaked build so that parallel jobs is doable