More events streaming tweaks