Improve Surfer buffer setup