Event feature fixes