Adjustments to lambda buffer