Fixes in packaging/upload logic