Small tweaks to the package