Tweaking a few things around the package definition