Some tweaks, plugin event changes