Should these be buffs? (not for this PR obviously, but just in general)