Handle the user buffer a bit better.