New packages, small tweaks