Fixes for CI