diff --git a/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java b/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java
index 60f4ec9..e8cc589 100644
--- a/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java
+++ b/fileinstall/src/main/java/org/apache/felix/fileinstall/DirectoryWatcher.java
@@ -94,7 +94,7 @@
         Object value = properties.get(START_NEW_BUNDLES);
         if (value != null)
         {
-            startBundles = Boolean.parseBoolean((String) value);
+            startBundles = "true".equalsIgnoreCase((String)value);
         }
     }
 
diff --git a/fileinstall/src/main/java/org/apache/felix/fileinstall/FileInstall.java b/fileinstall/src/main/java/org/apache/felix/fileinstall/FileInstall.java
index 6d536d3..1986029 100644
--- a/fileinstall/src/main/java/org/apache/felix/fileinstall/FileInstall.java
+++ b/fileinstall/src/main/java/org/apache/felix/fileinstall/FileInstall.java
@@ -68,7 +68,7 @@
         Object o = context.getProperty(key);
         if (o == null)
         {
-            o = System.getenv(key.toUpperCase().replaceAll(".", "_"));
+           o = System.getProperty(key.toUpperCase().replace('.', '_'));
             if (o == null)
             {
                 return;
diff --git a/fileinstall/src/main/java/org/apache/felix/fileinstall/Jar.java b/fileinstall/src/main/java/org/apache/felix/fileinstall/Jar.java
index bca2019..a9d1f68 100644
--- a/fileinstall/src/main/java/org/apache/felix/fileinstall/Jar.java
+++ b/fileinstall/src/main/java/org/apache/felix/fileinstall/Jar.java
@@ -18,13 +18,12 @@
  */
 package org.apache.felix.fileinstall;
 
-import org.osgi.framework.Bundle;
-
 import java.io.File;
-import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
+import org.osgi.framework.Bundle;
+
 /**
  * This class is used to cache vital information of a jar file
  * that is used during later processing. It also overrides hashCode and