Fixes problems with upstream changes