CI improvements