Some more fixes for CI