Minor package initialization tweaks