Fix group/event controllers