Tasks events fixes