Specs: Resolved some event bugs