Patch up so that the new stuff works as a package