Fixed buffer discrepancies.