[master] fixes for PkgWrangler review