Fix build for downstreams