Minor bug fixes on captured events