mini-events fixes