Fixed issues with tarballs

Change-Id: I6a39d8849d4de9cbd90ab0e28506a84af673c2a8