Various fixes for getting particle stacking to work in the buckets.