More CI fixing...