Buffs, fixes, etc