fixes for CI build machine