Some more fixes for CI
Some more fixes for CI