Working kinks out of CI