More fixes for CI