Minor tweaks for packaging.