Fix some errors with emails on service events