Some additional tweaks to event generation