Some more fixes for buffs system