Improve buffer compensation