ActiveAE: add drain and fill to buffers