Package updates; cosmetic fixes