Changes so that make dist and a build of the tarball work.