downstream fixes for the buffer move