diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/BundleScanner.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/BundleScanner.java
index c04fbcd2a1..57d18a1dfe 100644
--- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/BundleScanner.java
+++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/BundleScanner.java
@@ -119,14 +119,18 @@ public class BundleScanner {
         File file = null;
         Bundle bundle = getBundle(bundleToSearch);
         if (bundle != null && bundle.getState() != Bundle.UNINSTALLED) {
-            URL url = FileLocator.find(bundle, new Path(basePath
-                    + IPathManager.SEPARATOR + pathToLookFor), null);
+            String path = basePath;
+            if (pathToLookFor != null
+                    && pathToLookFor.trim().isEmpty() == false) {
+                path += IPathManager.SEPARATOR + pathToLookFor;
+            }
+            URL url = FileLocator.find(bundle, new Path(path), null);
             if (url != null) {
                 URL resolvedURL = null;
                 try {
                     resolvedURL = FileLocator.toFileURL(url);
                 } catch (IOException e) {
-
+                    
                 }
                 if (resolvedURL != null) {
                     file = new File(resolvedURL.getPath());
diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
index 036772020e..9fa72603ad 100644
--- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
+++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
@@ -76,10 +76,11 @@ public class LocalizationInitializer {
         LocalizationContext baseContext = pm.getContext(
                 LocalizationType.CAVE_CONFIG, LocalizationLevel.BASE);
         String filePath = "config.xml";
-        for (String bundle : BundleScanner.getListOfBundles()) {
-            File copyFrom = BundleScanner.searchInBundle(bundle, "", filePath);
+        BundleScanner scanner = new BundleScanner(filePath);
+        for (String bundle : scanner.getContributingBundles()) {
+            File copyFrom = scanner.searchInBundle(bundle, null);
             if (copyFrom != null) {
-                String searchPath = bundle + File.separator + filePath;
+                String searchPath = bundle + IPathManager.SEPARATOR + filePath;
                 File copyTo = pm.getFile(baseContext, searchPath);
                 if (copyTo.exists() == false
                         || copyFrom.lastModified() != copyTo.lastModified()) {
diff --git a/cave/com.raytheon.viz.avnfps.feature/feature.xml b/cave/com.raytheon.viz.avnfps.feature/feature.xml
index 6a87f6c6a7..d86a1d8988 100644
--- a/cave/com.raytheon.viz.avnfps.feature/feature.xml
+++ b/cave/com.raytheon.viz.avnfps.feature/feature.xml
@@ -33,8 +33,7 @@
          id="com.raytheon.viz.aviation"
          download-size="0"
          install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="com.raytheon.viz.avnconfig"