diff --git a/modules/auxiliary/admin/http/wp_automatic_plugin_privesc.rb b/modules/auxiliary/admin/http/wp_automatic_plugin_privesc.rb
index 6df4fa0fa5..5e3f0f76b2 100644
--- a/modules/auxiliary/admin/http/wp_automatic_plugin_privesc.rb
+++ b/modules/auxiliary/admin/http/wp_automatic_plugin_privesc.rb
@@ -31,13 +31,13 @@ class MetasploitModule < Msf::Auxiliary
         'Targets' => [['WordPress', {}]],
         'DefaultTarget' => 0,
         'References' => [
-          ['URL', 'https://blog.nintechnet.com/critical-vulnerability-fixed-in-wordpress-automatic-plugin/'],
-          ['NOCVE', 'Patched in 3.53.3 without vendor disclosure']
+          ['URL', 'https://blog.nintechnet.com/critical-vulnerability-fixed-in-wordpress-automatic-plugin/']
         ],
         'Notes' => {
           'Stability' => [CRASH_SAFE],
           'Reliability' => [],
-          'SideEffects' => [CONFIG_CHANGES, IOC_IN_LOGS]
+          'SideEffects' => [CONFIG_CHANGES, IOC_IN_LOGS],
+          'NOCVE' => ['Patched in 3.53.3 without vendor disclosure']
         }
       )
     )
diff --git a/modules/auxiliary/admin/http/wp_gdpr_compliance_privesc.rb b/modules/auxiliary/admin/http/wp_gdpr_compliance_privesc.rb
index 4f04e6c025..8cb163f86e 100644
--- a/modules/auxiliary/admin/http/wp_gdpr_compliance_privesc.rb
+++ b/modules/auxiliary/admin/http/wp_gdpr_compliance_privesc.rb
@@ -35,7 +35,9 @@ class MetasploitModule < Msf::Auxiliary
         ],
       'Notes'           =>
         {
-          'SideEffects' =>  [CONFIG_CHANGES]
+          'Stability' => [],
+          'Reliability' => [],
+          'SideEffects' => [CONFIG_CHANGES]
         },
       'DisclosureDate'  => '2018-11-08'
     ))
diff --git a/modules/exploits/linux/misc/cisco_rv340_sslvpn.rb b/modules/exploits/linux/misc/cisco_rv340_sslvpn.rb
index dc25a53e62..cb795ce5e4 100644
--- a/modules/exploits/linux/misc/cisco_rv340_sslvpn.rb
+++ b/modules/exploits/linux/misc/cisco_rv340_sslvpn.rb
@@ -62,10 +62,10 @@ class MetasploitModule < Msf::Exploit::Remote
         'DisclosureDate' => '2022-02-02',
         'DefaultTarget' => 0,
         'Notes' => {
-          'Stability' => CRASH_SERVICE_RESTARTS,
+          'Stability' => [CRASH_SERVICE_RESTARTS],
           # repeatable... but only works 65% of the time, see comments above
-          'Reliability' => REPEATABLE_SESSION,
-          'SideEffects' => nil
+          'Reliability' => [REPEATABLE_SESSION],
+          'SideEffects' => []
         }
       )
     )
diff --git a/modules/exploits/unix/webapp/bolt_authenticated_rce.rb b/modules/exploits/unix/webapp/bolt_authenticated_rce.rb
index 9ce2c03226..f1b7caaed1 100644
--- a/modules/exploits/unix/webapp/bolt_authenticated_rce.rb
+++ b/modules/exploits/unix/webapp/bolt_authenticated_rce.rb
@@ -83,7 +83,7 @@ class MetasploitModule < Msf::Exploit::Remote
         },
         'DefaultTarget' => 2,
         'Notes' => {
-          'NOCVE' => '0day',
+          'NOCVE' => ['0day'],
           'Stability' => [SERVICE_RESOURCE_LOSS], # May hang up the service
           'Reliability' => [REPEATABLE_SESSION],
           'SideEffects' => [IOC_IN_LOGS, CONFIG_CHANGES, ARTIFACTS_ON_DISK]
diff --git a/modules/exploits/windows/browser/malwarebytes_update_exec.rb b/modules/exploits/windows/browser/malwarebytes_update_exec.rb
index b7a855b1e8..e3aa87e1a5 100644
--- a/modules/exploits/windows/browser/malwarebytes_update_exec.rb
+++ b/modules/exploits/windows/browser/malwarebytes_update_exec.rb
@@ -35,7 +35,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'References'     =>
         [
           [ 'CVE', '2014-4936' ],
-          [' OSVDB', '116050'],
+          [ 'OSVDB', '116050' ],
           [ 'URL', 'http://blog.0x3a.com/post/104954032239/cve-2014-4936-malwarebytes-anti-malware-and'] # Discoverer's blog
         ],
       'DefaultOptions' =>