Fixed issues with tarball

Change-Id: I617de8f6b8b117aeaaf7a846b700c10fa9572d56