fixes for CI environment