Client tweaks to events