Update for lifetime changes
pkgid
Merge pull request #3 from cmr/fixes

some fixes