Fix group timeouts