diff --git a/apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java b/apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java
index c0735c6b9..cc7d5cf65 100644
--- a/apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java
+++ b/apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java
@@ -9,6 +9,8 @@
 
 package net.i2p.apps.systray;
 
+import net.i2p.util.ShellCommand;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 
diff --git a/apps/systray/java/src/net/i2p/apps/systray/ShellCommand.java b/core/java/src/net/i2p/util/ShellCommand.java
similarity index 99%
rename from apps/systray/java/src/net/i2p/apps/systray/ShellCommand.java
rename to core/java/src/net/i2p/util/ShellCommand.java
index ff0ae5f20..58989a8fa 100644
--- a/apps/systray/java/src/net/i2p/apps/systray/ShellCommand.java
+++ b/core/java/src/net/i2p/util/ShellCommand.java
@@ -7,7 +7,7 @@
  * This code is public domain.
  */
 
-package net.i2p.apps.systray;
+package net.i2p.util;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/installer/install.xml b/installer/install.xml
index 6e1089f6a..a21df9e90 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -31,7 +31,7 @@
         <panel classname="InfoPanel"/>
         <panel classname="TargetPanel"/>
         <panel classname="InstallPanel"/>
-        <panel classname="FinishPanel"/>
+        <panel classname="SimpleFinishPanel"/>
     </panels>
 
     <packs>