Fix things for CI server