diff --git a/sql12/build.xml b/sql12/build.xml
index 535d18014..fef17d29b 100644
--- a/sql12/build.xml
+++ b/sql12/build.xml
@@ -1,7 +1,7 @@
 <project name="SQuirreLSQL" default="buildAll" basedir=".">
 
 
-    <property name="targetVM" value="11"/>
+    <property name="targetVM" value="17"/>
 
     <target name="cleanAllAndInit" description="cleanAllAndInit">
 
@@ -110,7 +110,7 @@
     </pathconvert>
 
     <target name="compileVersionCheck" description="compileVersionCheck">
-        <javac source="1.6" target="1.6"
+        <javac source="8" target="8"
                includeantruntime="false"
                srcdir="versionChecker/src"
                destdir="versionChecker/output/work/bin"
@@ -286,4 +286,4 @@
         </java>
     </target>
 
-</project> 
+</project>
diff --git a/sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java b/sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java
index f12af4548..7456127c8 100644
--- a/sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java
+++ b/sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java
@@ -693,7 +693,7 @@ public static OkJPanel[] getControlPanels()
             new ArrayList<String>(Arrays.asList(initialClassNameList));
 
       // add to that the list of all names that have been registered by plugins
-//		Iterator<IDataTypeComponentFactory> pluginDataTypeFactories = 
+//		Iterator<IDataTypeComponentFactory> pluginDataTypeFactories =
 //		    _registeredDataTypes.values().iterator();
 //		while (pluginDataTypeFactories.hasNext()) {
 //		    TODO: add support for plugin-registered data-type preferences panels
@@ -859,6 +859,7 @@ private static IDataTypeComponent getGenericDataType(JTable table, ColumnDisplay
             case Types.TIMESTAMP:
             case -101: // Oracle's 'TIMESTAMP WITH TIME ZONE' == -101
             case -102: // Oracle's 'TIMESTAMP WITH LOCAL TIME ZONE' == -102
+            case -155: // MSSQL Server's 'TIMESTAMP WITH LOCAL TIME ZONE' == -155
                dataTypeComponent = new DataTypeTimestamp(table, colDef);
                break;