Add our extra paths early and patch up the path later