Fixing pop bug on small buffers and pushing connect to pipeline