diff --git a/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.jsx b/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.jsx
index 4247fed94de95b14fbeed4f40bb5b137fa83ffc3..8d7a82a62a39b69d736072a1f02931add777d161 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.jsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.jsx
@@ -12,7 +12,7 @@ const SETTING_TYPES = [
       "date_style",
       "date_separator",
       "date_abbreviate",
-      "time_enabled",
+      // "time_enabled",
       "time_style",
     ],
     column: {
diff --git a/frontend/src/metabase/visualizations/components/ColumnSettings.jsx b/frontend/src/metabase/visualizations/components/ColumnSettings.jsx
index 64e7e6cc7e74f53cf1549b8610ac1ea2e9b02a88..9a2c78551901adc6f982f46b2c751def051841fe 100644
--- a/frontend/src/metabase/visualizations/components/ColumnSettings.jsx
+++ b/frontend/src/metabase/visualizations/components/ColumnSettings.jsx
@@ -43,7 +43,7 @@ const ColumnSettings = ({
 
   // add a "unit" to make certain settings work
   if (column.unit == null) {
-    column = { ...column, unit: "millisecond" };
+    column = { ...column, unit: "default" };
   }
 
   // $FlowFixMe
diff --git a/frontend/src/metabase/visualizations/components/TableInteractive.jsx b/frontend/src/metabase/visualizations/components/TableInteractive.jsx
index 1f7b55bba30bbbd289309ede48a7f4397eb45a52..823018cdcf719b86d6681f9fed081be34d01e59c 100644
--- a/frontend/src/metabase/visualizations/components/TableInteractive.jsx
+++ b/frontend/src/metabase/visualizations/components/TableInteractive.jsx
@@ -448,7 +448,7 @@ export default class TableInteractive extends Component {
     const column = cols[columnIndex];
 
     let columnTitle =
-      settings.column(column)._column_title_full || formatColumn(column);
+      settings.column(column)["_column_title_full"] || formatColumn(column);
 
     if (!columnTitle && this.props.isPivoted && columnIndex !== 0) {
       columnTitle = t`Unset`;
diff --git a/frontend/src/metabase/visualizations/components/TableSimple.jsx b/frontend/src/metabase/visualizations/components/TableSimple.jsx
index 2d1eacb04498d7740a37a0fa44462cf6e459e752..28f86d95cf2daa8270d739e8e62bda9399380651 100644
--- a/frontend/src/metabase/visualizations/components/TableSimple.jsx
+++ b/frontend/src/metabase/visualizations/components/TableSimple.jsx
@@ -154,7 +154,7 @@ export default class TableSimple extends Component {
                           }}
                         />
                         <Ellipsified>
-                          {settings.column(col)._column_title_full ||
+                          {settings.column(col)["_column_title_full"] ||
                             formatColumn(col)}
                         </Ellipsified>
                       </div>
diff --git a/frontend/src/metabase/visualizations/lib/settings/column.js b/frontend/src/metabase/visualizations/lib/settings/column.js
index 25ef04006e39d6a391d879e9203ba73a99718f6f..c620c14ad396bba1bc6f268b5dda56b4e3cdfce7 100644
--- a/frontend/src/metabase/visualizations/lib/settings/column.js
+++ b/frontend/src/metabase/visualizations/lib/settings/column.js
@@ -228,10 +228,15 @@ export const DATE_COLUMN_SETTINGS = {
         { name: t`Off`, value: null },
         { name: t`HH:MM`, value: "minutes" },
       ];
-      if (!unit || unit === "default" || unit === "second") {
+      if (
+        !unit ||
+        unit === "default" ||
+        unit === "second" ||
+        unit === "millisecond"
+      ) {
         options.push({ name: t`HH:MM:SS`, value: "seconds" });
       }
-      if (!unit || unit === "default") {
+      if (!unit || unit === "default" || unit === "millisecond") {
         options.push({ name: t`HH:MM:SS.MS`, value: "milliseconds" });
       }
       if (options.length === 2) {