Fixes to meet new TrayPlugin events model.