SAF: fixing up events a bit.