diff --git a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java
index 023c713..c7f30d2 100644
--- a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java
+++ b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java
@@ -143,15 +143,15 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
 					retval=false;
 				}
 				loader.removePropertyChangeListener(this);
-				for (IWaveform w : loader.getAllWaves()) {
-					waveforms.put(w.getFullName(), w);
-				}
+//				for (IWaveform w : loader.getAllWaves()) {
+//					waveforms.put(w.getFullName(), w);
+//				}
 				if (loader.getMaxTime() > maxTime) {
 					maxTime = loader.getMaxTime();
 				}
 				if (name == null)
 					name = getFileBasename(inp.getName());
-				buildHierarchyNodes();
+				//buildHierarchyNodes();
 				relationTypes.addAll(loader.getAllRelationTypes());
 			}
 		}
diff --git a/pom.xml b/pom.xml
index 8754121..fc8fa1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,9 +75,9 @@
 						</artifact>
 					</target>
 					<executionEnvironment>
-						org.eclipse.justj.openjdk.hotspot.jre.minimal-15</executionEnvironment>
+						org.eclipse.justj.openjdk.hotspot.jre.minimal-17</executionEnvironment>
 					<executionEnvironmentDefault>
-						org.eclipse.justj.openjdk.hotspot.jre.minimal-15</executionEnvironmentDefault>
+						org.eclipse.justj.openjdk.hotspot.jre.minimal-17</executionEnvironmentDefault>
 					<includePackedArtifacts>true</includePackedArtifacts>
 					<environments>
 						<environment>
diff --git a/products/com.minres.scviewer.e4.product/scviewer.product b/products/com.minres.scviewer.e4.product/scviewer.product
index 839590f..2b8bfc5 100644
--- a/products/com.minres.scviewer.e4.product/scviewer.product
+++ b/products/com.minres.scviewer.e4.product/scviewer.product
@@ -34,7 +34,7 @@
    </launcher>
 
    <vm>
-      <linux include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</linux>
+      <linux include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</linux>
       <macos include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</macos>
       <windows include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</windows>
    </vm>
diff --git a/releng/com.minres.scviewer.target/com.minres.scviewer.target.target b/releng/com.minres.scviewer.target/com.minres.scviewer.target.target
index a8e4b18..101cb67 100644
--- a/releng/com.minres.scviewer.target/com.minres.scviewer.target.target
+++ b/releng/com.minres.scviewer.target/com.minres.scviewer.target.target
@@ -36,7 +36,7 @@
 		<unit id="org.eclipse.collections.feature.source.feature.group" version="0.0.0"/>
 	</location>
 	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<repository location="https://download.eclipse.org/justj/jres/15/updates/release/latest"/>
+		<repository location="https://download.eclipse.org/justj/jres/17/updates/release/latest"/>
 		<unit id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped.feature.group" version="0.0.0"/>
 	</location>
 	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">