Quality of life improvements for buffer switching