fixes for CI