Updates following upstream changes