Improve packaging scripts