Improve packaging.