Minor fixes for CI