Buffer fixes.