Fixed some bugs for completed events

Signed-off-by: gitta-mannen <mail@janpettersson.com>