Fixing upstream changes