fixup! Port remaining build jobs