Fixes for CI build.