Small changes to the package