MERGE FIRST: Buffer Length Fixes