Updates to prepare for tarball