One brown-bag and extra checking on buffer management.