Buffer style fixes