Misc changes to pkg update