Packaging tidyups