Minor package tweaks