Fix downstream build