Fix new buffer creation/selection