diff --git a/nova/flags.py b/nova/flags.py
index aca602f7..83a3c853 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -410,7 +410,7 @@ global_opts = [
     cfg.BoolOpt('enable_instance_password',
                 default=True,
                 help='Allows use of instance password during '
-                       'server creation'),
+                     'server creation'),
     cfg.IntOpt('password_length',
                default=12,
                help='Length of generated instance admin passwords'),
@@ -427,9 +427,9 @@ global_opts = [
                 default=False,
                 help='Allow destination machine to match source for resize. '
                      'Useful when testing in single-host environments.'),
-    cfg.StrOpt('stub_network',
-               default=False,
-               help='Stub network related code'),
+    cfg.BoolOpt('stub_network',
+                default=False,
+                help='Stub network related code'),
     cfg.IntOpt('reclaim_instance_interval',
                default=0,
                help='Interval in seconds for reclaiming deleted instances'),
diff --git a/nova/rpc/__init__.py b/nova/rpc/__init__.py
index f5b9fa8d..acfc10e7 100644
--- a/nova/rpc/__init__.py
+++ b/nova/rpc/__init__.py
@@ -34,7 +34,7 @@ rpc_opts = [
     cfg.IntOpt('rpc_response_timeout',
                default=60,
                help='Seconds to wait for a response from call or multicall'),
-    cfg.IntOpt('allowed_rpc_exception_modules',
+    cfg.ListOpt('allowed_rpc_exception_modules',
                default=['nova.exception'],
                help='Modules of exceptions that are permitted to be recreated'
                     'upon receiving exception data from an rpc call.'),