Job events fixes