Vendor fixes

Fixes some bugs, makes vendors drop refillers on deconstruction and
generally use refillers more
Merge pull request #2801 from Razharas/Vendors

Vendor fixes and stuff