pull buffer fixes