Minor package fixes.