diff --git a/docs/upgrades/_upgrade.skeleton b/docs/upgrades/_upgrade.skeleton
index 3071f93f1..2ab5a0a24 100644
--- a/docs/upgrades/_upgrade.skeleton
+++ b/docs/upgrades/_upgrade.skeleton
@@ -75,13 +75,13 @@ sub start {
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->set({name=>"Upgrade to ".$toVersion});
     $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-    updateTemplates($session);
     return $session;
 }
 
 #-------------------------------------------------
 sub finish {
     my $session = shift;
+    updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
     $session->close();
diff --git a/docs/upgrades/upgrade_7.4.40-7.5.16.pl b/docs/upgrades/upgrade_7.4.40-7.5.16.pl
index c2cdcd377..4d95d21ab 100644
--- a/docs/upgrades/upgrade_7.4.40-7.5.16.pl
+++ b/docs/upgrades/upgrade_7.4.40-7.5.16.pl
@@ -1996,1076 +1996,6 @@ sub makeLongerAssetMetadataValues {
     print "DONE!\n" unless $quiet;
 }
 
-sub ensureCorrectDefaults {
-    my $session = shift;
-    print "\tEnsuring correct database defaults..." unless $quiet;
-    my $sql = <<'END_SQL';
-
-ALTER TABLE `Article`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `cacheTimeout` int(11) NOT NULL DEFAULT '3600',
-  MODIFY `storageId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL
-;
-
-ALTER TABLE `Calendar`
-  MODIFY `revisionDate` bigint(20) unsigned NOT NULL DEFAULT '0',
-  MODIFY `visitorCacheTimeout` int(11) unsigned DEFAULT NULL,
-  MODIFY `workflowIdCommit` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL
-;
-
-ALTER TABLE `Collaboration`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `postGroupId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '2',
-  MODIFY `canStartThreadGroupId` varchar(22) NOT NULL DEFAULT '2',
-  MODIFY `karmaPerPost` int(11) NOT NULL DEFAULT '0',
-  MODIFY `collaborationTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `threadTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `postFormTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `searchTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `notificationTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `sortBy` varchar(35) NOT NULL DEFAULT 'assetData.revisionDate',
-  MODIFY `sortOrder` varchar(4) NOT NULL DEFAULT 'desc',
-  MODIFY `usePreview` int(11) NOT NULL DEFAULT '1',
-  MODIFY `addEditStampToPosts` int(11) NOT NULL DEFAULT '0',
-  MODIFY `editTimeout` int(11) NOT NULL DEFAULT '3600',
-  MODIFY `attachmentsPerPost` int(11) NOT NULL DEFAULT '0',
-  MODIFY `filterCode` varchar(30) NOT NULL DEFAULT 'javascript',
-  MODIFY `useContentFilter` int(11) NOT NULL DEFAULT '1',
-  MODIFY `threads` int(11) NOT NULL DEFAULT '0',
-  MODIFY `views` int(11) NOT NULL DEFAULT '0',
-  MODIFY `replies` int(11) NOT NULL DEFAULT '0',
-  MODIFY `rating` int(11) NOT NULL DEFAULT '0',
-  MODIFY `lastPostId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `archiveAfter` int(11) NOT NULL DEFAULT '31536000',
-  MODIFY `postsPerPage` int(11) NOT NULL DEFAULT '10',
-  MODIFY `threadsPerPage` int(11) NOT NULL DEFAULT '30',
-  MODIFY `subscriptionGroupId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `allowReplies` int(11) NOT NULL DEFAULT '0',
-  MODIFY `displayLastReply` int(11) NOT NULL DEFAULT '0',
-  MODIFY `richEditor` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'PBrichedit000000000002',
-  MODIFY `karmaRatingMultiplier` int(11) NOT NULL DEFAULT '0',
-  MODIFY `karmaSpentToRate` int(11) NOT NULL DEFAULT '0',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `avatarsEnabled` int(11) NOT NULL DEFAULT '0',
-  MODIFY `approvalWorkflow` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'pbworkflow000000000003',
-  MODIFY `threadApprovalWorkflow` varchar(22) NOT NULL DEFAULT 'pbworkflow000000000003',
-  MODIFY `defaultKarmaScale` int(11) NOT NULL DEFAULT '1',
-  MODIFY `getMail` int(11) NOT NULL DEFAULT '0',
-  MODIFY `getMailInterval` int(11) NOT NULL DEFAULT '300',
-  MODIFY `getMailCronId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `visitorCacheTimeout` int(11) NOT NULL DEFAULT '3600',
-  MODIFY `autoSubscribeToThread` int(11) NOT NULL DEFAULT '1',
-  MODIFY `requireSubscriptionForEmailPosting` int(11) NOT NULL DEFAULT '1',
-  MODIFY `thumbnailSize` int(11) NOT NULL DEFAULT '0',
-  MODIFY `maxImageSize` int(11) NOT NULL DEFAULT '0',
-  MODIFY `enablePostMetaData` int(11) NOT NULL DEFAULT '0',
-  MODIFY `useCaptcha` int(11) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `Dashboard`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `revisionDate` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `adminsGroupId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '4',
-  MODIFY `usersGroupId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '2',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'DashboardViewTmpl00001',
-  MODIFY `isInitialized` tinyint(3) unsigned NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `DataForm`
-  MODIFY `mailData` int(11) NOT NULL DEFAULT '1',
-  MODIFY `emailTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `acknowlegementTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `listTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `defaultView` int(11) NOT NULL DEFAULT '0',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `groupToViewEntries` varchar(22) NOT NULL DEFAULT '7'
-;
-
-ALTER TABLE `DataForm_entry`
-  MODIFY `DataForm_entryId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `userId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `EMSBadge`
-  MODIFY `price` float NOT NULL DEFAULT '0',
-  MODIFY `seatsAvailable` int(11) NOT NULL DEFAULT '100'
-;
-
-ALTER TABLE `EMSEventMetaField`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL
-;
-
-ALTER TABLE `EMSRegistrant`
-  MODIFY `userId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `transactionItemId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL
-;
-
-ALTER TABLE `EMSRegistrantRibbon`
-  MODIFY `transactionItemId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL
-;
-
-ALTER TABLE `EMSRegistrantTicket`
-  MODIFY `transactionItemId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL
-;
-
-ALTER TABLE `EMSRibbon`
-  MODIFY `percentageDiscount` float NOT NULL DEFAULT '10',
-  MODIFY `price` float NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `EMSTicket`
-  MODIFY `price` float NOT NULL DEFAULT '0',
-  MODIFY `seatsAvailable` int(11) NOT NULL DEFAULT '100',
-  MODIFY `duration` float NOT NULL DEFAULT '1'
-;
-
-ALTER TABLE `EMSToken`
-  MODIFY `price` float NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `Event`
-  MODIFY `timeZone` varchar(255) character set utf8 collate utf8_bin DEFAULT 'America/Chicago'
-;
-
-ALTER TABLE `EventManagementSystem`
-  MODIFY `groupToApproveEvents` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `timezone` varchar(30) NOT NULL DEFAULT 'America/Chicago',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '2rC4ErZ3c77OJzJm7O5s3w',
-  MODIFY `badgeBuilderTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'BMybD3cEnmXVk2wQ_qEsRQ',
-  MODIFY `lookupRegistrantTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'OOyMH33plAy6oCj_QWrxtg',
-  MODIFY `printBadgeTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'PsFn7dJt4wMwBa8hiE3hOA',
-  MODIFY `printTicketTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'yBwydfooiLvhEFawJb0VTQ'
-;
-
-ALTER TABLE `FileAsset`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `storageId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `filename` varchar(255) NOT NULL DEFAULT '',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `cacheTimeout` int(11) NOT NULL DEFAULT '3600'
-;
-
-ALTER TABLE `FlatDiscount`
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '63ix2-hU0FchXGIWkG3tow',
-  MODIFY `mustSpend` float NOT NULL DEFAULT '0',
-  MODIFY `percentageDiscount` int(3) NOT NULL DEFAULT '0',
-  MODIFY `priceDiscount` float NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `Folder`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `visitorCacheTimeout` int(11) NOT NULL DEFAULT '3600',
-  MODIFY `sortAlphabetically` int(11) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `Gallery`
-  MODIFY `groupIdAddComment` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `groupIdAddFile` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `richEditIdComment` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `templateIdAddArchive` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `templateIdDeleteAlbum` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `templateIdDeleteFile` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `templateIdEditAlbum` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `templateIdEditFile` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `templateIdListAlbums` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `templateIdListAlbumsRss` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `templateIdListFilesForUser` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `templateIdListFilesForUserRss` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `templateIdMakeShortcut` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `templateIdSearch` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `templateIdViewSlideshow` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `templateIdViewThumbnails` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `templateIdViewAlbum` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `templateIdViewAlbumRss` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `templateIdViewFile` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `workflowIdCommit` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `templateIdEditComment` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `richEditIdAlbum` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `richEditIdFile` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL
-;
-
-ALTER TABLE `GalleryAlbum`
-  MODIFY `assetIdThumbnail` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL
-;
-
-ALTER TABLE `GalleryFile_comment`
-  MODIFY `userId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL
-;
-
-ALTER TABLE `HttpProxy`
-  MODIFY `cookieJarStorageId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `cacheTimeout` int(11) NOT NULL DEFAULT '0',
-  MODIFY `useAmpersand` int(11) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `ITransact_recurringStatus`
-  MODIFY `gatewayId` varchar(128) NOT NULL DEFAULT '',
-  MODIFY `initDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `lastTransaction` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `status` varchar(10) NOT NULL DEFAULT '',
-  MODIFY `recipe` varchar(15) NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `ImageAsset`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `thumbnailSize` int(11) NOT NULL DEFAULT '50',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `InOutBoard`
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `reportViewerGroup` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '3',
-  MODIFY `inOutGroup` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '2',
-  MODIFY `inOutTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'IOB0000000000000000001',
-  MODIFY `reportTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'IOB0000000000000000002',
-  MODIFY `paginateAfter` int(11) NOT NULL DEFAULT '50',
-  MODIFY `reportPaginateAfter` int(11) NOT NULL DEFAULT '50'
-;
-
-ALTER TABLE `Layout`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `Matrix`
-  MODIFY `detailTemplateId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `compareTemplateId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `searchTemplateId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `ratingDetailTemplateId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `maxComparisons` int(11) NOT NULL DEFAULT '10',
-  MODIFY `maxComparisonsPrivileged` int(11) NOT NULL DEFAULT '10',
-  MODIFY `privilegedGroup` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '2',
-  MODIFY `groupToRate` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '2',
-  MODIFY `ratingTimeout` int(11) NOT NULL DEFAULT '31536000',
-  MODIFY `ratingTimeoutPrivileged` int(11) NOT NULL DEFAULT '31536000',
-  MODIFY `groupToAdd` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '2',
-  MODIFY `visitorCacheTimeout` int(11) NOT NULL DEFAULT '3600'
-;
-
-ALTER TABLE `Matrix_field`
-  MODIFY `fieldId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `category` varchar(255) NOT NULL DEFAULT '',
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `Matrix_listing`
-  MODIFY `listingId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `maintainerId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `forumId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `views` int(11) NOT NULL DEFAULT '0',
-  MODIFY `compares` int(11) NOT NULL DEFAULT '0',
-  MODIFY `clicks` int(11) NOT NULL DEFAULT '0',
-  MODIFY `status` varchar(30) NOT NULL DEFAULT 'pending',
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `approvalMessageId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `storageId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL
-;
-
-ALTER TABLE `Matrix_listingData`
-  MODIFY `listingId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `fieldId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `Matrix_rating`
-  MODIFY `timeStamp` int(11) NOT NULL DEFAULT '0',
-  MODIFY `rating` int(11) NOT NULL DEFAULT '1',
-  MODIFY `listingId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `Matrix_ratingSummary`
-  MODIFY `listingId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `category` varchar(255) NOT NULL DEFAULT '',
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `MessageBoard`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `visitorCacheTimeout` int(11) NOT NULL DEFAULT '3600'
-;
-
-ALTER TABLE `MultiSearch`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `revisionDate` bigint(20) unsigned NOT NULL DEFAULT '0',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'MultiSearchTmpl0000001',
-  MODIFY `cacheTimeout` int(11) NOT NULL DEFAULT '3600'
-;
-
-ALTER TABLE `Navigation`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `descendantEndPoint` int(11) NOT NULL DEFAULT '55',
-  MODIFY `showSystemPages` int(11) NOT NULL DEFAULT '0',
-  MODIFY `showHiddenPages` int(11) NOT NULL DEFAULT '0',
-  MODIFY `showUnprivilegedPages` int(11) NOT NULL DEFAULT '0',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `ancestorEndPoint` int(11) NOT NULL DEFAULT '55',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `Newsletter`
-  MODIFY `newsletterTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'newsletter000000000001',
-  MODIFY `mySubscriptionsTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'newslettersubscrip0001'
-;
-
-ALTER TABLE `Newsletter_subscriptions`
-  MODIFY `lastTimeSent` bigint(20) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `PM_project`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `projectManager` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `percentComplete` float NOT NULL DEFAULT '0',
-  MODIFY `parentId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `projectObserver` varchar(22) character set utf8 collate utf8_bin DEFAULT '7'
-;
-
-ALTER TABLE `PM_task`
-  MODIFY `parentId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `sequenceNumber` int(11) NOT NULL DEFAULT '1',
-  MODIFY `taskType` enum('timed','progressive','milestone') NOT NULL DEFAULT 'timed'
-;
-
-ALTER TABLE `PM_wobject`
-  MODIFY `projectDashboardTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'ProjectManagerTMPL0001',
-  MODIFY `projectDisplayTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'ProjectManagerTMPL0002',
-  MODIFY `ganttChartTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'ProjectManagerTMPL0003',
-  MODIFY `editTaskTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'ProjectManagerTMPL0004',
-  MODIFY `groupToAdd` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '3',
-  MODIFY `resourcePopupTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'ProjectManagerTMPL0005',
-  MODIFY `resourceListTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'ProjectManagerTMPL0006'
-;
-
-ALTER TABLE `Photo_rating`
-  MODIFY `userId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL
-;
-
-ALTER TABLE `Poll`
-  MODIFY `active` int(11) NOT NULL DEFAULT '1',
-  MODIFY `graphWidth` int(11) NOT NULL DEFAULT '150',
-  MODIFY `karmaPerVote` int(11) NOT NULL DEFAULT '0',
-  MODIFY `randomizeAnswers` int(11) NOT NULL DEFAULT '0',
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `Poll_answer`
-  MODIFY `userId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `Post`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `threadId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `views` int(11) NOT NULL DEFAULT '0',
-  MODIFY `contentType` varchar(35) NOT NULL DEFAULT 'mixed',
-  MODIFY `storageId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `rating` int(11) NOT NULL DEFAULT '0',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `Post_rating`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `userId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `ipAddress` varchar(15) NOT NULL DEFAULT '',
-  MODIFY `rating` int(11) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `Product`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `cacheTimeout` int(11) NOT NULL DEFAULT '3600'
-;
-
-ALTER TABLE `RSSCapable`
-  MODIFY `rssCapableRssEnabled` int(11) NOT NULL DEFAULT '1',
-  MODIFY `rssCapableRssTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'PBtmpl0000000000000142',
-  MODIFY `rssCapableRssFromParentId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL
-;
-
-ALTER TABLE `RichEdit`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `askAboutRichEdit` int(11) NOT NULL DEFAULT '0',
-  MODIFY `preformatted` int(11) NOT NULL DEFAULT '0',
-  MODIFY `editorWidth` int(11) NOT NULL DEFAULT '0',
-  MODIFY `editorHeight` int(11) NOT NULL DEFAULT '0',
-  MODIFY `sourceEditorWidth` int(11) NOT NULL DEFAULT '0',
-  MODIFY `sourceEditorHeight` int(11) NOT NULL DEFAULT '0',
-  MODIFY `useBr` int(11) NOT NULL DEFAULT '0',
-  MODIFY `nowrap` int(11) NOT NULL DEFAULT '0',
-  MODIFY `removeLineBreaks` int(11) NOT NULL DEFAULT '0',
-  MODIFY `npwrap` int(11) NOT NULL DEFAULT '0',
-  MODIFY `directionality` char(3) NOT NULL DEFAULT 'ltr',
-  MODIFY `toolbarLocation` varchar(6) NOT NULL DEFAULT 'bottom',
-  MODIFY `enableContextMenu` int(11) NOT NULL DEFAULT '0',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `inlinePopups` int(11) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `SQLReport`
-  MODIFY `paginateAfter` int(11) NOT NULL DEFAULT '50',
-  MODIFY `debugMode` int(11) NOT NULL DEFAULT '0',
-  MODIFY `databaseLinkId1` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `databaseLinkId2` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `databaseLinkId3` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `databaseLinkId4` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `databaseLinkId5` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `cacheTimeout` int(11) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `Shelf`
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'nFen0xjkZn8WkpM93C9ceQ'
-;
-
-ALTER TABLE `Shortcut`
-  MODIFY `overrideTitle` int(11) NOT NULL DEFAULT '0',
-  MODIFY `overrideDescription` int(11) NOT NULL DEFAULT '0',
-  MODIFY `overrideTemplate` int(11) NOT NULL DEFAULT '0',
-  MODIFY `overrideDisplayTitle` int(11) NOT NULL DEFAULT '0',
-  MODIFY `overrideTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `shortcutByCriteria` int(11) NOT NULL DEFAULT '0',
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `shortcutToAssetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `disableContentLock` int(11) NOT NULL DEFAULT '0',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `showReloadIcon` tinyint(3) unsigned NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `Shortcut_overrides`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `fieldName` varchar(255) NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `StockData`
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'StockListTMPL000000001',
-  MODIFY `displayTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'StockListTMPL000000002'
-;
-
-ALTER TABLE `Subscription`
-  MODIFY `templateId` varchar(22) NOT NULL DEFAULT '',
-  MODIFY `price` float NOT NULL DEFAULT '0',
-  MODIFY `subscriptionGroup` varchar(22) NOT NULL DEFAULT '2',
-  MODIFY `duration` varchar(12) NOT NULL DEFAULT 'Monthly'
-;
-
-ALTER TABLE `Subscription_OLD`
-  MODIFY `subscriptionId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `subscriptionGroup` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `duration` varchar(12) NOT NULL DEFAULT 'Monthly'
-;
-
-ALTER TABLE `Subscription_code`
-  MODIFY `status` varchar(10) NOT NULL DEFAULT 'Unused'
-;
-
-ALTER TABLE `Survey`
-  MODIFY `groupToTakeSurvey` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '2',
-  MODIFY `groupToViewReports` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '3',
-  MODIFY `Survey_id` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `anonymous` char(1) NOT NULL DEFAULT '0',
-  MODIFY `questionsPerPage` int(11) NOT NULL DEFAULT '1',
-  MODIFY `responseTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `overviewTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `maxResponsesPerUser` int(11) NOT NULL DEFAULT '1',
-  MODIFY `questionsPerResponse` int(11) NOT NULL DEFAULT '9999999',
-  MODIFY `gradebookTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `Survey_answer`
-  MODIFY `Survey_id` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `Survey_questionId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `Survey_answerId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `sequenceNumber` int(11) NOT NULL DEFAULT '1',
-  MODIFY `gotoQuestion` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `isCorrect` int(11) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `Survey_question`
-  MODIFY `Survey_id` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `Survey_questionId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `sequenceNumber` int(11) NOT NULL DEFAULT '1',
-  MODIFY `allowComment` int(11) NOT NULL DEFAULT '0',
-  MODIFY `randomizeAnswers` int(11) NOT NULL DEFAULT '0',
-  MODIFY `Survey_sectionId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `Survey_questionResponse`
-  MODIFY `Survey_id` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `Survey_questionId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `Survey_answerId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `Survey_responseId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `dateOfResponse` bigint(20) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `Survey_response`
-  MODIFY `Survey_id` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `Survey_responseId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `startDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `endDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `isComplete` int(11) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `Survey_section`
-  MODIFY `Survey_id` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `Survey_sectionId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `sequenceNumber` int(11) NOT NULL DEFAULT '1'
-;
-
-ALTER TABLE `SyndicatedContent`
-  MODIFY `maxHeadlines` int(11) NOT NULL DEFAULT '0',
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `displayMode` varchar(20) NOT NULL DEFAULT 'interleaved',
-  MODIFY `hasTerms` varchar(255) NOT NULL DEFAULT '',
-  MODIFY `cacheTimeout` int(11) NOT NULL DEFAULT '3600'
-;
-
-ALTER TABLE `TT_projectList`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL
-;
-
-ALTER TABLE `TT_projectResourceList`
-  MODIFY `resourceId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `TT_report`
-  MODIFY `reportComplete` int(11) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `TT_wobject`
-  MODIFY `userViewTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'TimeTrackingTMPL000001',
-  MODIFY `managerViewTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'TimeTrackingTMPL000002',
-  MODIFY `timeRowTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'TimeTrackingTMPL000003',
-  MODIFY `pmAssetId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `groupToManage` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '3',
-  MODIFY `pmIntegration` int(11) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `Thingy_things`
-  MODIFY `thingsPerPage` int(11) NOT NULL DEFAULT '25'
-;
-
-ALTER TABLE `Thread`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `replies` int(11) NOT NULL DEFAULT '0',
-  MODIFY `lastPostId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `isLocked` int(11) NOT NULL DEFAULT '0',
-  MODIFY `isSticky` int(11) NOT NULL DEFAULT '0',
-  MODIFY `subscriptionGroupId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `karma` int(11) NOT NULL DEFAULT '0',
-  MODIFY `karmaScale` int(11) NOT NULL DEFAULT '1'
-;
-
-ALTER TABLE `Thread_read`
-  MODIFY `threadId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `userId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `UserList`
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `WSClient`
-  MODIFY `uri` varchar(255) NOT NULL DEFAULT '',
-  MODIFY `proxy` varchar(255) NOT NULL DEFAULT '',
-  MODIFY `preprocessMacros` int(11) NOT NULL DEFAULT '0',
-  MODIFY `paginateAfter` int(11) NOT NULL DEFAULT '50',
-  MODIFY `debugMode` int(11) NOT NULL DEFAULT '0',
-  MODIFY `execute_by_default` tinyint(4) NOT NULL DEFAULT '1',
-  MODIFY `decodeUtf8` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  MODIFY `sharedCache` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  MODIFY `cacheTTL` smallint(5) unsigned NOT NULL DEFAULT '60',
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `WeatherData`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `revisionDate` bigint(20) unsigned NOT NULL DEFAULT '0',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'WeatherDataTmpl0000001'
-;
-
-ALTER TABLE `WikiMaster`
-  MODIFY `groupToEditPages` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '2',
-  MODIFY `groupToAdminister` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '3',
-  MODIFY `richEditor` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'PBrichedit000000000002',
-  MODIFY `frontPageTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'WikiFrontTmpl000000001',
-  MODIFY `pageTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'WikiPageTmpl0000000001',
-  MODIFY `pageEditTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'WikiPageEditTmpl000001',
-  MODIFY `recentChangesTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'WikiRCTmpl000000000001',
-  MODIFY `mostPopularTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'WikiMPTmpl000000000001',
-  MODIFY `pageHistoryTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'WikiPHTmpl000000000001',
-  MODIFY `searchTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'WikiSearchTmpl00000001',
-  MODIFY `recentChangesCount` int(11) NOT NULL DEFAULT '50',
-  MODIFY `recentChangesCountFront` int(11) NOT NULL DEFAULT '10',
-  MODIFY `mostPopularCount` int(11) NOT NULL DEFAULT '50',
-  MODIFY `mostPopularCountFront` int(11) NOT NULL DEFAULT '10',
-  MODIFY `thumbnailSize` int(11) NOT NULL DEFAULT '0',
-  MODIFY `maxImageSize` int(11) NOT NULL DEFAULT '0',
-  MODIFY `approvalWorkflow` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'pbworkflow000000000003',
-  MODIFY `byKeywordTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'WikiKeyword00000000001',
-  MODIFY `allowAttachments` int(11) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `WikiPage`
-  MODIFY `views` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `isProtected` int(11) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `Workflow`
-  MODIFY `title` varchar(255) NOT NULL DEFAULT 'Untitled',
-  MODIFY `enabled` int(11) NOT NULL DEFAULT '0',
-  MODIFY `type` varchar(255) NOT NULL DEFAULT 'None',
-  MODIFY `mode` varchar(20) NOT NULL DEFAULT 'parallel'
-;
-
-ALTER TABLE `WorkflowActivity`
-  MODIFY `title` varchar(255) NOT NULL DEFAULT 'Untitled',
-  MODIFY `sequenceNumber` int(11) NOT NULL DEFAULT '1'
-;
-
-ALTER TABLE `WorkflowInstance`
-  MODIFY `priority` int(11) NOT NULL DEFAULT '2'
-;
-
-ALTER TABLE `WorkflowSchedule`
-  MODIFY `title` varchar(255) NOT NULL DEFAULT 'Untitled',
-  MODIFY `enabled` int(11) NOT NULL DEFAULT '0',
-  MODIFY `runOnce` int(11) NOT NULL DEFAULT '0',
-  MODIFY `minuteOfHour` varchar(25) NOT NULL DEFAULT '0',
-  MODIFY `hourOfDay` varchar(25) NOT NULL DEFAULT '*',
-  MODIFY `dayOfMonth` varchar(25) NOT NULL DEFAULT '*',
-  MODIFY `monthOfYear` varchar(25) NOT NULL DEFAULT '*',
-  MODIFY `dayOfWeek` varchar(25) NOT NULL DEFAULT '*',
-  MODIFY `priority` int(11) NOT NULL DEFAULT '2'
-;
-
-ALTER TABLE `ZipArchiveAsset`
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `showPage` varchar(255) NOT NULL DEFAULT 'index.html'
-;
-
-ALTER TABLE `adSpace`
-  MODIFY `costPerImpression` decimal(11,2) NOT NULL DEFAULT '0.00',
-  MODIFY `minimumImpressions` int(11) NOT NULL DEFAULT '1000',
-  MODIFY `costPerClick` decimal(11,2) NOT NULL DEFAULT '0.00',
-  MODIFY `minimumClicks` int(11) NOT NULL DEFAULT '1000',
-  MODIFY `width` int(11) NOT NULL DEFAULT '468',
-  MODIFY `height` int(11) NOT NULL DEFAULT '60',
-  MODIFY `groupToPurchase` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '3'
-;
-
-ALTER TABLE `addressBook`
-  MODIFY `sessionId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `userId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL
-;
-
-ALTER TABLE `advertisement`
-  MODIFY `isActive` int(11) NOT NULL DEFAULT '0',
-  MODIFY `type` varchar(15) NOT NULL DEFAULT 'text',
-  MODIFY `storageId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `borderColor` varchar(7) NOT NULL DEFAULT '#000000',
-  MODIFY `textColor` varchar(7) NOT NULL DEFAULT '#000000',
-  MODIFY `backgroundColor` varchar(7) NOT NULL DEFAULT '#ffffff',
-  MODIFY `clicks` int(11) NOT NULL DEFAULT '0',
-  MODIFY `clicksBought` int(11) NOT NULL DEFAULT '0',
-  MODIFY `impressions` int(11) NOT NULL DEFAULT '0',
-  MODIFY `impressionsBought` int(11) NOT NULL DEFAULT '0',
-  MODIFY `priority` int(11) NOT NULL DEFAULT '0',
-  MODIFY `nextInPriority` bigint(20) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `asset`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `parentId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `lineage` varchar(255) NOT NULL DEFAULT '',
-  MODIFY `state` varchar(35) NOT NULL DEFAULT '',
-  MODIFY `className` varchar(255) NOT NULL DEFAULT '',
-  MODIFY `creationDate` bigint(20) NOT NULL DEFAULT '997995720',
-  MODIFY `createdBy` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '3',
-  MODIFY `stateChanged` varchar(22) NOT NULL DEFAULT '997995720',
-  MODIFY `stateChangedBy` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '3',
-  MODIFY `isLockedBy` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `isSystem` int(11) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `assetData`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `revisedBy` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `tagId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `status` varchar(35) NOT NULL DEFAULT 'pending',
-  MODIFY `title` varchar(255) NOT NULL DEFAULT 'untitled',
-  MODIFY `menuTitle` varchar(255) NOT NULL DEFAULT 'untitled',
-  MODIFY `url` varchar(255) NOT NULL DEFAULT '',
-  MODIFY `ownerUserId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `groupIdView` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `groupIdEdit` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `newWindow` int(11) NOT NULL DEFAULT '0',
-  MODIFY `isHidden` int(11) NOT NULL DEFAULT '0',
-  MODIFY `isPackage` int(11) NOT NULL DEFAULT '0',
-  MODIFY `isPrototype` int(11) NOT NULL DEFAULT '0',
-  MODIFY `encryptPage` int(11) NOT NULL DEFAULT '0',
-  MODIFY `assetSize` int(11) NOT NULL DEFAULT '0',
-  MODIFY `skipNotification` int(11) NOT NULL DEFAULT '0',
-  MODIFY `isExportable` int(11) NOT NULL DEFAULT '1',
-  MODIFY `inheritUrlFromParent` int(11) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `assetHistory`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `userId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `dateStamp` bigint(20) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `assetIndex`
-  MODIFY `ownerUserId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `groupIdView` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `groupIdEdit` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `isPublic` int(11) NOT NULL DEFAULT '1'
-;
-
-ALTER TABLE `assetVersionTag`
-  MODIFY `tagId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `name` varchar(255) NOT NULL DEFAULT '',
-  MODIFY `isCommitted` int(11) NOT NULL DEFAULT '0',
-  MODIFY `creationDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `createdBy` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `commitDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `committedBy` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `isLocked` int(11) NOT NULL DEFAULT '0',
-  MODIFY `lockedBy` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `groupToUse` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `workflowId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `workflowInstanceId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL
-;
-
-ALTER TABLE `authentication`
-  MODIFY `userId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `authMethod` varchar(30) NOT NULL DEFAULT '',
-  MODIFY `fieldName` varchar(128) NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `cart`
-  MODIFY `shippingAddressId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `shipperId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `couponId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL
-;
-
-ALTER TABLE `cartItem`
-  MODIFY `shippingAddressId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `quantity` int(11) NOT NULL DEFAULT '1'
-;
-
-ALTER TABLE `databaseLink`
-  MODIFY `databaseLinkId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `allowMacroAccess` int(11) NOT NULL DEFAULT '0',
-  MODIFY `additionalParameters` varchar(255) NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `donation`
-  MODIFY `defaultPrice` float NOT NULL DEFAULT '100'
-;
-
-ALTER TABLE `groupGroupings`
-  MODIFY `groupId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `groupings`
-  MODIFY `groupId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `userId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `expireDate` bigint(20) NOT NULL DEFAULT '2114402400',
-  MODIFY `groupAdmin` int(11) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `groups`
-  MODIFY `groupId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `expireOffset` int(11) NOT NULL DEFAULT '314496000',
-  MODIFY `karmaThreshold` int(11) NOT NULL DEFAULT '1000000000',
-  MODIFY `dateCreated` int(11) NOT NULL DEFAULT '997938000',
-  MODIFY `lastUpdated` int(11) NOT NULL DEFAULT '997938000',
-  MODIFY `deleteOffset` int(11) NOT NULL DEFAULT '14',
-  MODIFY `expireNotifyOffset` int(11) NOT NULL DEFAULT '-14',
-  MODIFY `expireNotify` int(11) NOT NULL DEFAULT '0',
-  MODIFY `autoAdd` int(11) NOT NULL DEFAULT '0',
-  MODIFY `autoDelete` int(11) NOT NULL DEFAULT '0',
-  MODIFY `databaseLinkId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `groupCacheTimeout` int(11) NOT NULL DEFAULT '3600',
-  MODIFY `isEditable` int(11) NOT NULL DEFAULT '1',
-  MODIFY `showInForms` int(11) NOT NULL DEFAULT '1',
-  MODIFY `ldapLinkId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL
-;
-
-ALTER TABLE `imageColor`
-  MODIFY `name` varchar(255) NOT NULL DEFAULT 'untitled',
-  MODIFY `fillTriplet` char(7) NOT NULL DEFAULT '#000000',
-  MODIFY `fillAlpha` char(2) NOT NULL DEFAULT '00',
-  MODIFY `strokeTriplet` char(7) NOT NULL DEFAULT '#000000',
-  MODIFY `strokeAlpha` char(2) NOT NULL DEFAULT '00'
-;
-
-ALTER TABLE `imagePalette`
-  MODIFY `name` varchar(255) NOT NULL DEFAULT 'untitled'
-;
-
-ALTER TABLE `inbox`
-  MODIFY `status` varchar(15) NOT NULL DEFAULT 'pending',
-  MODIFY `completedBy` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `userId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `groupId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `subject` varchar(255) NOT NULL DEFAULT 'No Subject',
-  MODIFY `sentBy` varchar(22) NOT NULL DEFAULT '3'
-;
-
-ALTER TABLE `incrementer`
-  MODIFY `incrementerId` varchar(50) NOT NULL DEFAULT '',
-  MODIFY `nextValue` int(11) NOT NULL DEFAULT '1'
-;
-
-ALTER TABLE `karmaLog`
-  MODIFY `userId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `amount` int(11) NOT NULL DEFAULT '1'
-;
-
-ALTER TABLE `ldapLink`
-  MODIFY `ldapLinkId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `ldapLinkName` varchar(255) NOT NULL DEFAULT '',
-  MODIFY `ldapUrl` varchar(255) NOT NULL DEFAULT '',
-  MODIFY `connectDn` varchar(255) NOT NULL DEFAULT '',
-  MODIFY `identifier` varchar(255) NOT NULL DEFAULT '',
-  MODIFY `ldapAccountTemplate` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `ldapCreateAccountTemplate` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `ldapLoginTemplate` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `mailQueue`
-  MODIFY `toGroup` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL
-;
-
-ALTER TABLE `metaData_properties`
-  MODIFY `fieldId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `fieldName` varchar(100) NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `metaData_values`
-  MODIFY `fieldId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `passiveProfileAOI`
-  MODIFY `userId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `fieldId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `value` varchar(100) NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `passiveProfileLog`
-  MODIFY `passiveProfileLogId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `userId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `sessionId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `dateOfEntry` bigint(20) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `redirect`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `replacements`
-  MODIFY `replacementId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `search`
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `searchRoot` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'PBasset000000000000001',
-  MODIFY `templateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'PBtmpl0000000000000200',
-  MODIFY `useContainers` int(11) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `settings`
-  MODIFY `name` varchar(255) NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `shopCredit`
-  MODIFY `amount` float NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `sku`
-  MODIFY `vendorId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'defaultvendor000000000',
-  MODIFY `displayTitle` tinyint(1) NOT NULL DEFAULT '1',
-  MODIFY `overrideTaxRate` tinyint(1) NOT NULL DEFAULT '0',
-  MODIFY `taxRateOverride` float NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `snippet`
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `processAsTemplate` int(11) NOT NULL DEFAULT '0',
-  MODIFY `mimeType` varchar(50) NOT NULL DEFAULT 'text/html',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `cacheTimeout` int(11) NOT NULL DEFAULT '3600'
-;
-
-ALTER TABLE `storageTranslation`
-  MODIFY `guidValue` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `hexValue` varchar(32) character set utf8 collate utf8_bin DEFAULT NULL
-;
-
-ALTER TABLE `subscriptionCode`
-  MODIFY `batchId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `code` varchar(64) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `status` varchar(10) NOT NULL DEFAULT 'Unused',
-  MODIFY `dateCreated` int(11) NOT NULL DEFAULT '0',
-  MODIFY `dateUsed` int(11) NOT NULL DEFAULT '0',
-  MODIFY `expires` int(11) NOT NULL DEFAULT '0',
-  MODIFY `usedBy` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `subscriptionCodeBatch`
-  MODIFY `batchId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `subscriptionId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `subscriptionCodeSubscriptions`
-  MODIFY `code` varchar(64) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `subscriptionId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `tax`
-  MODIFY `taxRate` float NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `template`
-  MODIFY `namespace` varchar(35) NOT NULL DEFAULT 'Page',
-  MODIFY `isEditable` int(11) NOT NULL DEFAULT '1',
-  MODIFY `showInForms` int(11) NOT NULL DEFAULT '1',
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0',
-  MODIFY `parser` varchar(255) NOT NULL DEFAULT 'WebGUI::Asset::Template::HTMLTemplate'
-;
-
-ALTER TABLE `transaction`
-  MODIFY `originatingTransactionId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `isSuccessful` tinyint(1) NOT NULL DEFAULT '0',
-  MODIFY `shippingAddressId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `shippingDriverId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `paymentAddressId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `paymentDriverId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL
-;
-
-ALTER TABLE `transactionItem`
-  MODIFY `shippingAddressId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `orderStatus` varchar(35) NOT NULL DEFAULT 'NotShipped',
-  MODIFY `quantity` int(11) NOT NULL DEFAULT '1',
-  MODIFY `vendorId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT 'defaultvendor000000000'
-;
-
-ALTER TABLE `userInvitations`
-  MODIFY `newUserId` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL
-;
-
-ALTER TABLE `userLoginLog`
-  MODIFY `userId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `userProfileCategory`
-  MODIFY `profileCategoryId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `label` varchar(255) NOT NULL DEFAULT 'Undefined',
-  MODIFY `sequenceNumber` int(11) NOT NULL DEFAULT '1',
-  MODIFY `visible` int(11) NOT NULL DEFAULT '1',
-  MODIFY `editable` int(11) NOT NULL DEFAULT '1',
-  MODIFY `protected` int(11) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `userProfileData`
-  MODIFY `photo` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL,
-  MODIFY `avatar` varchar(22) character set utf8 collate utf8_bin DEFAULT NULL
-;
-
-ALTER TABLE `userProfileField`
-  MODIFY `fieldName` varchar(128) NOT NULL DEFAULT '',
-  MODIFY `label` varchar(255) NOT NULL DEFAULT 'Undefined',
-  MODIFY `visible` int(11) NOT NULL DEFAULT '0',
-  MODIFY `required` int(11) NOT NULL DEFAULT '0',
-  MODIFY `fieldType` varchar(128) NOT NULL DEFAULT 'text',
-  MODIFY `sequenceNumber` int(11) NOT NULL DEFAULT '1',
-  MODIFY `profileCategoryId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `protected` int(11) NOT NULL DEFAULT '0',
-  MODIFY `editable` int(11) NOT NULL DEFAULT '1',
-  MODIFY `showAtRegistration` int(11) NOT NULL DEFAULT '0',
-  MODIFY `requiredForPasswordRecovery` int(11) NOT NULL DEFAULT '0'
-;
-
-ALTER TABLE `userSession`
-  MODIFY `sessionId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `adminOn` int(11) NOT NULL DEFAULT '0',
-  MODIFY `userId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `userSessionScratch`
-  MODIFY `sessionId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `name` varchar(255) NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `users`
-  MODIFY `userId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `authMethod` varchar(30) NOT NULL DEFAULT 'WebGUI',
-  MODIFY `dateCreated` int(11) NOT NULL DEFAULT '1019867418',
-  MODIFY `lastUpdated` int(11) NOT NULL DEFAULT '1019867418',
-  MODIFY `karma` int(11) NOT NULL DEFAULT '0',
-  MODIFY `status` varchar(35) NOT NULL DEFAULT 'Active',
-  MODIFY `referringAffiliate` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `friendsGroup` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT ''
-;
-
-ALTER TABLE `wobject`
-  MODIFY `displayTitle` int(11) NOT NULL DEFAULT '1',
-  MODIFY `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `styleTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `printableStyleTemplateId` varchar(22) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
-  MODIFY `revisionDate` bigint(20) NOT NULL DEFAULT '0'
-;
-END_SQL
-    my @stmts = split /;/, $sql; # this isn't safe in general, but I know it will be fine here.
-    for my $stmt (@stmts) {
-        $stmt =~ s/^\s+//;
-        $stmt =~ s/\s+$//;
-        next unless $stmt;
-        $session->db->write($stmt);
-    }
-    print " Done.\n" unless $quiet;
-}
-
-
 #----------------------------------------------------------------------------
 sub privatizeVisitor {
     my $session = shift;
@@ -3275,7 +2205,7 @@ sub repairDBCharset {
                 push @stmts, sprintf("ALTER TABLE %s CHANGE %s %s %s CHARACTER SET binary", $dbh->quote_identifier($table), $dbh->quote_identifier($row->{Field}), $dbh->quote_identifier($row->{Field}), $row->{Type});
                 # Now we convert to UTF8, and it should be stored properly.  We're using a UTF8 connection,
                 # so everything should just work from here on
-                push @stmts, sprintf("ALTER TABLE %s CHANGE %s %s %s CHARACTER SET utf8", $dbh->quote_identifier($table), $dbh->quote_identifier($row->{Field}), $dbh->quote_identifier($row->{Field}), $row->{Type});
+                push @stmts, sprintf("ALTER TABLE %s CHANGE %s %s %s CHARACTER SET utf8 DEFAULT %s", $dbh->quote_identifier($table), $dbh->quote_identifier($row->{Field}), $dbh->quote_identifier($row->{Field}), $row->{Type}, $dbh->quote($row->{Default}));
             }
         }
         $sth->finish;
@@ -4023,13 +2953,13 @@ sub start {
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->set({name=>"Upgrade to ".$toVersion});
     $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-    updateTemplates($session);
     return $session;
 }
 
 #-------------------------------------------------
 sub finish {
     my $session = shift;
+    updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
     $session->close();
diff --git a/docs/upgrades/upgrade_7.5.15-7.5.16.pl b/docs/upgrades/upgrade_7.5.15-7.5.16.pl
index 4014daed7..2b6f842b2 100644
--- a/docs/upgrades/upgrade_7.5.15-7.5.16.pl
+++ b/docs/upgrades/upgrade_7.5.15-7.5.16.pl
@@ -94,13 +94,13 @@ sub start {
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->set({name=>"Upgrade to ".$toVersion});
     $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
-    updateTemplates($session);
     return $session;
 }
 
 #-------------------------------------------------
 sub finish {
     my $session = shift;
+    updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
     $session->close();