diff --git a/src/manage.c b/src/manage.c
index 8fbd26559..25c1a459b 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -5834,7 +5834,6 @@ get_nvt_xml (iterator_t *nvts, int details, int pref_count,
                                   "<modification_time>%s</modification_time>"
                                   "<category>%d</category>"
                                   "<family>%s</family>"
-                                  "<cvss_base>%s</cvss_base>"
                                   "<qod>"
                                   "<value>%s</value>"
                                   "<type>%s</type>"
@@ -5850,9 +5849,6 @@ get_nvt_xml (iterator_t *nvts, int details, int pref_count,
                                   : "",
                                   nvt_iterator_category (nvts),
                                   family_text,
-                                  nvt_iterator_cvss_base (nvts)
-                                  ? nvt_iterator_cvss_base (nvts)
-                                  : "",
                                   nvt_iterator_qod (nvts),
                                   nvt_iterator_qod_type (nvts),
                                   refs_str->str,
@@ -5861,7 +5857,7 @@ get_nvt_xml (iterator_t *nvts, int details, int pref_count,
         }
 
       g_string_append_printf (buffer,
-                              "<severities score=\"%s\">",
+                              "<cvss_base>%s</cvss_base>",
                               nvt_iterator_cvss_base (nvts)
                               ? nvt_iterator_cvss_base (nvts)
                               : "");
@@ -5870,6 +5866,12 @@ get_nvt_xml (iterator_t *nvts, int details, int pref_count,
         {
           iterator_t severities;
 
+          g_string_append_printf (buffer,
+                                  "<severities score=\"%s\">",
+                                  nvt_iterator_cvss_base (nvts)
+                                  ? nvt_iterator_cvss_base (nvts)
+                                  : "");
+
           init_nvt_severity_iterator (&severities, oid);
           while (next (&severities))
             {
@@ -5888,10 +5890,10 @@ get_nvt_xml (iterator_t *nvts, int details, int pref_count,
                  nvt_severity_iterator_value (&severities));
             }
           cleanup_iterator (&severities);
-        }
 
-      g_string_append_printf (buffer,
-                              "</severities>");
+          g_string_append_printf (buffer,
+                                  "</severities>");
+        }
 
       g_free (family_text);
       g_string_free (nvt_tags, 1);
diff --git a/src/manage_sql_configs.c b/src/manage_sql_configs.c
index e339232ae..02c4294c1 100644
--- a/src/manage_sql_configs.c
+++ b/src/manage_sql_configs.c
@@ -1762,7 +1762,7 @@ init_nvt_preference_iterator (iterator_t* iterator, const char *oid)
                      " AND name != 'nasl_no_signature_check'"
                      " AND name != 'network_targets'"
                      " AND name != 'ntp_save_sessions'"
-                     " AND name != '%s:0:entry:Timeout'"
+                     " AND name != '%s:0:entry:timeout'"
                      " AND name NOT %s 'server_info_%%'"
                      /* Task preferences. */
                      " AND name != 'max_checks'"
@@ -1782,7 +1782,7 @@ init_nvt_preference_iterator (iterator_t* iterator, const char *oid)
                    " AND name != 'nasl_no_signature_check'"
                    " AND name != 'network_targets'"
                    " AND name != 'ntp_save_sessions'"
-                   " AND name NOT %s '%%:0:entry:Timeout'"
+                   " AND name NOT %s '%%:0:entry:timeout'"
                    " AND name NOT %s 'server_info_%%'"
                    /* Task preferences. */
                    " AND name != 'max_checks'"
diff --git a/src/manage_sql_nvts.c b/src/manage_sql_nvts.c
index b921427fa..925f4e612 100644
--- a/src/manage_sql_nvts.c
+++ b/src/manage_sql_nvts.c
@@ -1210,7 +1210,7 @@ char *
 nvt_default_timeout (const char* oid)
 {
   return sql_string ("SELECT value FROM nvt_preferences"
-                     " WHERE name = '%s:0:entry:Timeout'",
+                     " WHERE name = '%s:0:entry:timeout'",
                      oid);
 }