A few fixes for CI