Minor tweaks for packaging