More fixes for correct CI