Minor fixups to package