diff --git a/ofagent/main.py b/ofagent/main.py
index 144a0ad..608e1e4 100755
--- a/ofagent/main.py
+++ b/ofagent/main.py
@@ -218,7 +218,7 @@
 
         # May want to specify the gRPC timeout as an arg (in future)
         # Right now, set a default value
-        self.grpc_timeout = 10
+        self.grpc_timeout = 120
 
         verbosity_adjust = (args.verbose or 0) - (args.quiet or 0)
         self.log = setup_logging(self.logconfig,
@@ -262,6 +262,7 @@
 
         reactor.addSystemEventTrigger('before', 'shutdown',
                                       self.shutdown_components)
+        reactor.suggestThreadPoolSize(30)
         reactor.run()