improvements for CI