Fixing build for CI