More fixes. Takes into account that we may not have an upstream tarball