Package upload: made changes to get package upload working