fixup references to upstream