minor event flow fixes