Fixed build for CI