Buffer optimizations