Improve buff collection for piggybackers