Tweak cibuild