Small pkgid fixes