Fix Trick-or-Treat and Forest Curse stacking