Fix releasetools with upstream changes