Tweaks to get pack tags to work.