diff --git a/sql/database-create.sql b/sql/database-create.sql
index b68e025c2989fdcce4fc770a137597d6c45915b3..73eaf3ae5ecc3107b2569ace6a4895d54686bf46 100644
--- a/sql/database-create.sql
+++ b/sql/database-create.sql
@@ -2949,13 +2949,13 @@ CREATE TABLE `nodes` (
   `role` enum('testnode','virtnode','ctrlnode','testswitch','ctrlswitch','powerctrl','widearea_switch','unused') NOT NULL default 'unused',
   `inception` datetime default NULL,
   `def_boot_osid` int(8) unsigned default NULL,
-  `def_boot_osid_vers` int(8) unsigned default NULL,
+  `def_boot_osid_vers` int(8) unsigned default '0',
   `def_boot_path` text,
   `def_boot_cmd_line` text,
   `temp_boot_osid` int(8) unsigned default NULL,
-  `temp_boot_osid_vers` int(8) unsigned default NULL,
+  `temp_boot_osid_vers` int(8) unsigned default '0',
   `next_boot_osid` int(8) unsigned default NULL,
-  `next_boot_osid_vers` int(8) unsigned default NULL,
+  `next_boot_osid_vers` int(8) unsigned default '0',
   `next_boot_path` text,
   `next_boot_cmd_line` text,
   `pxe_boot_path` text,
diff --git a/sql/updates/4/398 b/sql/updates/4/398
index d6bad9463500d7213437af9a65ed245a48104f3e..63b8dbda6ffed4e3f0abf8ded6ea72980890c3fe 100644
--- a/sql/updates/4/398
+++ b/sql/updates/4/398
@@ -67,6 +67,7 @@ sub DoUpdate($$$)
 	DBQueryFatal("replace into emulab_indicies ".
 		     "select 'next_profile',max(profileid)+1 ".
 		     " from apt_profiles");
+	DBQueryFatal("drop table apt_profiles_old");
     }
     return 0;
 }