Minor buffer changes