Close several addpkg issues