Small changes to DYNAMIC-BUFFER conditions.