Fixed: a lint change and an event change to mix with Diva