Original commit message from CVS: EVENTS2 BRANCH: adjusted mad and osssink to work with newer buffers