CI improvements...