More cibuild updates