diff --git a/com.ibm.wala-feature/feature.xml b/com.ibm.wala-feature/feature.xml
index 12344504b..3e42d90f3 100644
--- a/com.ibm.wala-feature/feature.xml
+++ b/com.ibm.wala-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.ibm.wala-feature"
       label="%featureName"
-      version="1.3.7"
+      version="1.3.8.qualifier"
       provider-name="%providerName">
 
    <plugin
diff --git a/com.ibm.wala-feature/pom.xml b/com.ibm.wala-feature/pom.xml
index c9becd677..2bdcc50c4 100644
--- a/com.ibm.wala-feature/pom.xml
+++ b/com.ibm.wala-feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>WALA</artifactId>
     <groupId>com.ibm.wala</groupId>
-    <version>1.3.7</version>
+    <version>1.3.8-SNAPSHOT</version>
   </parent>
   <artifactId>com.ibm.wala-feature</artifactId>
   <packaging>eclipse-feature</packaging>
diff --git a/com.ibm.wala-repository/pom.xml b/com.ibm.wala-repository/pom.xml
index e4779c17c..3a450fd5b 100644
--- a/com.ibm.wala-repository/pom.xml
+++ b/com.ibm.wala-repository/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ibm.wala</groupId>
         <artifactId>WALA</artifactId>
-        <version>1.3.7</version>
+        <version>1.3.8-SNAPSHOT</version>
     </parent>
     <artifactId>com.ibm.wala-repository</artifactId>
     <packaging>eclipse-repository</packaging>
diff --git a/com.ibm.wala.cast.java.polyglot.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java.polyglot.test/META-INF/MANIFEST.MF
index 6d2a5ca53..668541d2d 100644
--- a/com.ibm.wala.cast.java.polyglot.test/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.java.polyglot.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: WALA Cast Java Polyglot Test Plug-in
 Bundle-SymbolicName: com.ibm.wala.cast.java.polyglot.test
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-Activator: com.ibm.wala.cast.java.polyglot.test.Activator
 Bundle-Vendor: IBM
 Require-Bundle: com.ibm.wala.cast;bundle-version="1.0.0",
diff --git a/com.ibm.wala.cast.java.polyglot.test/pom.xml b/com.ibm.wala.cast.java.polyglot.test/pom.xml
index b825259bc..e1ed710ea 100644
--- a/com.ibm.wala.cast.java.polyglot.test/pom.xml
+++ b/com.ibm.wala.cast.java.polyglot.test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ibm.wala</groupId>
         <artifactId>WALA</artifactId>
-        <version>1.3.7</version>
+        <version>1.3.8-SNAPSHOT</version>
     </parent>
   <artifactId>com.ibm.wala.cast.java.polyglot.test</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.ibm.wala.cast.java.polyglot/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java.polyglot/META-INF/MANIFEST.MF
index 5e650c42e..f83d153fe 100644
--- a/com.ibm.wala.cast.java.polyglot/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.java.polyglot/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: WALA CAst Java Polyglot Plug-in
 Bundle-SymbolicName: com.ibm.wala.cast.java.polyglot
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-Vendor: IBM
 Require-Bundle: com.ibm.wala.cast.java,
  com.ibm.wala.cast,
diff --git a/com.ibm.wala.cast.java.polyglot/pom.xml b/com.ibm.wala.cast.java.polyglot/pom.xml
index 93af5ad6a..b9ee18201 100644
--- a/com.ibm.wala.cast.java.polyglot/pom.xml
+++ b/com.ibm.wala.cast.java.polyglot/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>WALA</artifactId>
 		<groupId>com.ibm.wala</groupId>
-		<version>1.3.7</version>
+		<version>1.3.8-SNAPSHOT</version>
 	</parent>
 	<artifactId>com.ibm.wala.cast.java.polyglot</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/com.ibm.wala.cast.java.test.data/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java.test.data/META-INF/MANIFEST.MF
index 9d9d6acac..8362d97fb 100644
--- a/com.ibm.wala.cast.java.test.data/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.java.test.data/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Data Plug-in
 Bundle-SymbolicName: com.ibm.wala.cast.java.test.data
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-Vendor: IBM
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/com.ibm.wala.cast.java.test.data/pom.xml b/com.ibm.wala.cast.java.test.data/pom.xml
index 287cc0380..d8d037788 100644
--- a/com.ibm.wala.cast.java.test.data/pom.xml
+++ b/com.ibm.wala.cast.java.test.data/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ibm.wala</groupId>
         <artifactId>WALA</artifactId>
-        <version>1.3.7</version>
+        <version>1.3.8-SNAPSHOT</version>
     </parent>
   <artifactId>com.ibm.wala.cast.java.test.data</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF
index eaebebe10..44b96f951 100644
--- a/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Java AST WALA Test Plug-in
 Bundle-SymbolicName: com.ibm.wala.cast.java.test
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-Activator: com.ibm.wala.cast.java.test.TestPlugin
 Bundle-Vendor: IBM
 Require-Bundle: com.ibm.wala.core.tests,
diff --git a/com.ibm.wala.cast.java.test/pom.xml b/com.ibm.wala.cast.java.test/pom.xml
index 03192b56d..723c2cbc8 100644
--- a/com.ibm.wala.cast.java.test/pom.xml
+++ b/com.ibm.wala.cast.java.test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ibm.wala</groupId>
         <artifactId>WALA</artifactId>
-        <version>1.3.7</version>
+        <version>1.3.8-SNAPSHOT</version>
     </parent>
   <artifactId>com.ibm.wala.cast.java.test</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.ibm.wala.cast.java/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java/META-INF/MANIFEST.MF
index 73e4cf4e2..7c6f33172 100644
--- a/com.ibm.wala.cast.java/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.java/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Java Source WALA Front End
 Bundle-SymbolicName: com.ibm.wala.cast.java
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-Activator: com.ibm.wala.cast.java.JavaSourcePlugin
 Bundle-Vendor: rfuhrer@watson.ibm.com
 Require-Bundle: com.ibm.wala.cast,
diff --git a/com.ibm.wala.cast.java/pom.xml b/com.ibm.wala.cast.java/pom.xml
index ea9399b48..11ed04a42 100644
--- a/com.ibm.wala.cast.java/pom.xml
+++ b/com.ibm.wala.cast.java/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>WALA</artifactId>
         <groupId>com.ibm.wala</groupId>
-        <version>1.3.7</version>
+        <version>1.3.8-SNAPSHOT</version>
     </parent>
   <artifactId>com.ibm.wala.cast.java</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF
index cf8e40dca..895ab2244 100644
--- a/com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nu_validator
 Bundle-SymbolicName: com.ibm.wala.cast.js.html.nu_validator
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Export-Package: com.ibm.wala.cast.js.html.nu_validator
 Require-Bundle: com.ibm.wala.cast.js;bundle-version="1.0.0",
  com.ibm.wala.cast.js.rhino.test;bundle-version="1.0.0",
diff --git a/com.ibm.wala.cast.js.html.nu_validator/pom.xml b/com.ibm.wala.cast.js.html.nu_validator/pom.xml
index 7de3bc827..4691adf2b 100644
--- a/com.ibm.wala.cast.js.html.nu_validator/pom.xml
+++ b/com.ibm.wala.cast.js.html.nu_validator/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>WALA</artifactId>
     <groupId>com.ibm.wala</groupId>
-    <version>1.3.7</version>
+    <version>1.3.8-SNAPSHOT</version>
   </parent>
   <artifactId>com.ibm.wala.cast.js.html.nu_validator</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF
index fb993268d..06b9dd290 100644
--- a/com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test Plug-in
 Bundle-SymbolicName: com.ibm.wala.cast.js.rhino.test
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-Vendor: IBM
 Require-Bundle: com.ibm.wala.cast.js.rhino;bundle-version="1.0.0",
  com.ibm.wala.cast.js;bundle-version="1.0.0",
diff --git a/com.ibm.wala.cast.js.rhino.test/pom.xml b/com.ibm.wala.cast.js.rhino.test/pom.xml
index a70000033..db1017965 100644
--- a/com.ibm.wala.cast.js.rhino.test/pom.xml
+++ b/com.ibm.wala.cast.js.rhino.test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ibm.wala</groupId>
         <artifactId>WALA</artifactId>
-        <version>1.3.7</version>
+        <version>1.3.8-SNAPSHOT</version>
     </parent>
   <artifactId>com.ibm.wala.cast.js.rhino.test</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF
index ff3f6234e..33566028a 100644
--- a/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Rhino Plug-in
 Bundle-SymbolicName: com.ibm.wala.cast.js.rhino
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-Activator: com.ibm.wala.js.rhino.Activator
 Bundle-Vendor: IBM
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/com.ibm.wala.cast.js.rhino/pom.xml b/com.ibm.wala.cast.js.rhino/pom.xml
index 761a5e882..9f97c9c9c 100644
--- a/com.ibm.wala.cast.js.rhino/pom.xml
+++ b/com.ibm.wala.cast.js.rhino/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>WALA</artifactId>
 		<groupId>com.ibm.wala</groupId>
-		<version>1.3.7</version>
+		<version>1.3.8-SNAPSHOT</version>
 	</parent>
 	<artifactId>com.ibm.wala.cast.js.rhino</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/com.ibm.wala.cast.js.test.data/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.test.data/META-INF/MANIFEST.MF
index 550b0ab75..7c0880a1e 100644
--- a/com.ibm.wala.cast.js.test.data/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.js.test.data/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Eclipse-LazyStart: true
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.ibm.wala.cast.js.test.data;singleton:=true
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
diff --git a/com.ibm.wala.cast.js.test.data/pom.xml b/com.ibm.wala.cast.js.test.data/pom.xml
index c2fd04c99..91fe4acb7 100644
--- a/com.ibm.wala.cast.js.test.data/pom.xml
+++ b/com.ibm.wala.cast.js.test.data/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ibm.wala</groupId>
         <artifactId>WALA</artifactId>
-        <version>1.3.7</version>
+        <version>1.3.8-SNAPSHOT</version>
     </parent>
   <artifactId>com.ibm.wala.cast.js.test.data</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.ibm.wala.cast.js.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js.test/META-INF/MANIFEST.MF
index 08dd10522..fe605df41 100755
--- a/com.ibm.wala.cast.js.test/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.js.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: WALA JavaScript Test Plug-in
 Bundle-SymbolicName: com.ibm.wala.cast.js.test;singleton:=true
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-ClassPath: test.jar
 Bundle-Vendor: IBM
 Require-Bundle: com.ibm.wala.cast.js,
diff --git a/com.ibm.wala.cast.js.test/pom.xml b/com.ibm.wala.cast.js.test/pom.xml
index c8ec3bbaa..9d2c9c287 100644
--- a/com.ibm.wala.cast.js.test/pom.xml
+++ b/com.ibm.wala.cast.js.test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ibm.wala</groupId>
         <artifactId>WALA</artifactId>
-        <version>1.3.7</version>
+        <version>1.3.8-SNAPSHOT</version>
     </parent>
   <artifactId>com.ibm.wala.cast.js.test</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.ibm.wala.cast.js/META-INF/MANIFEST.MF b/com.ibm.wala.cast.js/META-INF/MANIFEST.MF
index 750568c7e..7a3aa5796 100644
--- a/com.ibm.wala.cast.js/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.js/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JavaScript Plug-in
 Bundle-SymbolicName: com.ibm.wala.cast.js;singleton:=true
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-ClassPath: .,
  lib/jericho-html-3.2.jar
 Bundle-Activator: com.ibm.wala.cast.js.JavaScriptPlugin
diff --git a/com.ibm.wala.cast.js/pom.xml b/com.ibm.wala.cast.js/pom.xml
index cacd4b0bf..e467b0c39 100644
--- a/com.ibm.wala.cast.js/pom.xml
+++ b/com.ibm.wala.cast.js/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>WALA</artifactId>
 		<groupId>com.ibm.wala</groupId>
-		<version>1.3.7</version>
+		<version>1.3.8-SNAPSHOT</version>
 	</parent>
 	<groupId>com.ibm.wala</groupId>
 	<artifactId>com.ibm.wala.cast.js</artifactId>
diff --git a/com.ibm.wala.cast.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.test/META-INF/MANIFEST.MF
index 5e8999555..e8f8b0d80 100644
--- a/com.ibm.wala.cast.test/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CAst Test Plug-in
 Bundle-SymbolicName: com.ibm.wala.cast.test
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-Vendor: IBM
 Require-Bundle: 
  org.junit;bundle-version="4.0.0",
diff --git a/com.ibm.wala.cast.test/pom.xml b/com.ibm.wala.cast.test/pom.xml
index 0a4ca49f8..21040e456 100644
--- a/com.ibm.wala.cast.test/pom.xml
+++ b/com.ibm.wala.cast.test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ibm.wala</groupId>
         <artifactId>WALA</artifactId>
-        <version>1.3.7</version>
+        <version>1.3.8-SNAPSHOT</version>
     </parent>
   <artifactId>com.ibm.wala.cast.test</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.ibm.wala.cast/META-INF/MANIFEST.MF b/com.ibm.wala.cast/META-INF/MANIFEST.MF
index a56d5ec73..b6426275e 100644
--- a/com.ibm.wala.cast/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: WALA CAst core Plug-in
 Bundle-SymbolicName: com.ibm.wala.cast
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-Activator: com.ibm.wala.cast.plugin.AstPlugin
 Bundle-Vendor: IBM
 Require-Bundle: com.ibm.wala.core,
diff --git a/com.ibm.wala.cast/pom.xml b/com.ibm.wala.cast/pom.xml
index 76a1ace18..ccfc2a902 100644
--- a/com.ibm.wala.cast/pom.xml
+++ b/com.ibm.wala.cast/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>WALA</artifactId>
         <groupId>com.ibm.wala</groupId>
-        <version>1.3.7</version>
+        <version>1.3.8-SNAPSHOT</version>
     </parent>
   <artifactId>com.ibm.wala.cast</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.ibm.wala.core.testdata/.classpath b/com.ibm.wala.core.testdata/.classpath
index 16d067f28..4f83b2397 100644
--- a/com.ibm.wala.core.testdata/.classpath
+++ b/com.ibm.wala.core.testdata/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/com.ibm.wala.core.testdata/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.core.testdata/.settings/org.eclipse.jdt.core.prefs
index 9e3e240c6..fab0ce24f 100644
--- a/com.ibm.wala.core.testdata/.settings/org.eclipse.jdt.core.prefs
+++ b/com.ibm.wala.core.testdata/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -105,7 +105,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/com.ibm.wala.core.testdata/META-INF/MANIFEST.MF b/com.ibm.wala.core.testdata/META-INF/MANIFEST.MF
index d08489c0d..6a2255804 100644
--- a/com.ibm.wala.core.testdata/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.core.testdata/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Testdata Plug-in
 Bundle-SymbolicName: com.ibm.wala.core.testdata
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-Vendor: IBM
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Eclipse-BuddyPolicy: registered
diff --git a/com.ibm.wala.core.testdata/build.xml b/com.ibm.wala.core.testdata/build.xml
index 1ce2a9f15..e2884744d 100644
--- a/com.ibm.wala.core.testdata/build.xml
+++ b/com.ibm.wala.core.testdata/build.xml
@@ -12,8 +12,8 @@
 	<property name="javacVerbose" value="false"/>
 	<property name="logExtension" value=".log"/>
 	<property name="compilerArg" value=""/>
-	<property name="javacSource" value="1.5"/>
-	<property name="javacTarget" value="1.5"/>
+	<property name="javacSource" value="1.8"/>
+	<property name="javacTarget" value="1.8"/>
     <property name="dir_bootclasspath" value="${java.home}/lib"/>
     <path id="path_bootclasspath">
             <fileset dir="${dir_bootclasspath}">
diff --git a/com.ibm.wala.core.testdata/pom.xml b/com.ibm.wala.core.testdata/pom.xml
index 7cc852816..72a679a5a 100644
--- a/com.ibm.wala.core.testdata/pom.xml
+++ b/com.ibm.wala.core.testdata/pom.xml
@@ -5,39 +5,48 @@
     <parent>
         <groupId>com.ibm.wala</groupId>
         <artifactId>WALA</artifactId>
-        <version>1.3.7</version>
+        <version>1.3.8-SNAPSHOT</version>
     </parent>
-  <artifactId>com.ibm.wala.core.testdata</artifactId>
-  <packaging>eclipse-plugin</packaging>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.7</version>
-				<executions>
-					<execution>
-						<phase>process-resources</phase>
-						<configuration>
-							<tasks>
-								<property name="compile_classpath" refid="maven.compile.classpath" />
-								<ant antfile="${basedir}/build.xml" target="build.update.jar" />
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-              <dependencies>
-                <dependency>
-                  <groupId>com.sun</groupId>
-                  <artifactId>tools</artifactId>
-                  <version>1.7</version>
-                  <scope>system</scope>
-                  <systemPath>${java.home}/../lib/tools.jar</systemPath>
-                </dependency>
-              </dependencies>
-			</plugin>
-		</plugins>
-	</build>
+    <packaging>jar</packaging>
+    <artifactId>com.ibm.wala.core.testdata</artifactId>
+    <build>
+      <plugins>
+	<plugin>
+	  <groupId>org.eclipse.tycho</groupId>
+	  <artifactId>tycho-compiler-plugin</artifactId>
+	  <version>${tycho-version}</version>
+	  <configuration>
+	    <source>1.8</source>
+	    <target>1.8</target>
+	  </configuration>
+	</plugin>
+	<plugin>
+	  <artifactId>maven-antrun-plugin</artifactId>
+	  <version>1.7</version>
+	  <executions>
+	    <execution>
+	      <phase>process-resources</phase>
+	      <configuration>
+		<tasks>
+		  <property name="compile_classpath" refid="maven.compile.classpath" />
+		  <ant antfile="${basedir}/build.xml" target="build.update.jar" />
+		</tasks>
+	      </configuration>
+	      <goals>
+		<goal>run</goal>
+	      </goals>
+	    </execution>
+	  </executions>
+          <dependencies>
+            <dependency>
+              <groupId>com.sun</groupId>
+              <artifactId>tools</artifactId>
+              <version>1.8</version>
+              <scope>system</scope>
+              <systemPath>${java.home}/../lib/tools.jar</systemPath>
+            </dependency>
+          </dependencies>
+	</plugin>
+      </plugins>
+    </build>
 </project>
diff --git a/com.ibm.wala.core.tests/META-INF/MANIFEST.MF b/com.ibm.wala.core.tests/META-INF/MANIFEST.MF
index 778c62f83..f6d5d1e99 100644
--- a/com.ibm.wala.core.tests/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.ibm.wala.core.tests;singleton:=true
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-Vendor: %providerName
 Require-Bundle: com.ibm.wala.shrike,
  com.ibm.wala.core,
diff --git a/com.ibm.wala.core.tests/com.ibm.wala.core.testdata_1.0.0.jar b/com.ibm.wala.core.tests/com.ibm.wala.core.testdata_1.0.0.jar
deleted file mode 120000
index 170bb690a..000000000
--- a/com.ibm.wala.core.tests/com.ibm.wala.core.testdata_1.0.0.jar
+++ /dev/null
@@ -1 +0,0 @@
-../com.ibm.wala.core.testdata/bin/com.ibm.wala.core.testdata_1.0.0.jar
\ No newline at end of file
diff --git a/com.ibm.wala.core.tests/pom.xml b/com.ibm.wala.core.tests/pom.xml
index 0318fef67..fe359214a 100644
--- a/com.ibm.wala.core.tests/pom.xml
+++ b/com.ibm.wala.core.tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
       <groupId>com.ibm.wala</groupId>
       <artifactId>WALA</artifactId>
-      <version>1.3.7</version>
+      <version>1.3.8-SNAPSHOT</version>
   </parent>
   <artifactId>com.ibm.wala.core.tests</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTest.java
index 466bb7b3e..0de1f4017 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTest.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTest.java
@@ -151,6 +151,16 @@ public class CallGraphTest extends WalaTestCase {
     }
   }
 
+  @Test public void testJava8Smoke() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
+    AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA,
+        CallGraphTestUtil.REGRESSION_EXCLUSIONS);
+    ClassHierarchy cha = ClassHierarchy.make(scope);
+    Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
+        "Llambda/SortingExample");
+    AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
+    CallGraphTestUtil.buildZeroCFA(options, new AnalysisCache(), cha, scope, false);
+  }
+  
   @Test public void testSystemProperties() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA,
         CallGraphTestUtil.REGRESSION_EXCLUSIONS);
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/shrike/DynamicCallGraphTestBase.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/shrike/DynamicCallGraphTestBase.java
index 3310d3ca7..8dbcb8c61 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/shrike/DynamicCallGraphTestBase.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/shrike/DynamicCallGraphTestBase.java
@@ -142,7 +142,7 @@ public abstract class DynamicCallGraphTestBase extends WalaTestCase {
       public void edgesTest(CallGraph staticCG, CGNode caller, MethodReference calleeRef) {
         if (! calleeRef.getName().equals(MethodReference.clinitName)) {
           Set<CGNode> nodes = staticCG.getNodes(calleeRef);
-          Assert.assertEquals(1, nodes.size());
+          Assert.assertEquals("expected one node for " + calleeRef, 1, nodes.size());
           CGNode callee = nodes.iterator().next();
         
           Assert.assertTrue("no edge for " + caller + " --> " + callee, staticCG.getPossibleSites(caller, callee).hasNext());
diff --git a/com.ibm.wala.core/META-INF/MANIFEST.MF b/com.ibm.wala.core/META-INF/MANIFEST.MF
index 0bc8b0012..54ee2c7fd 100644
--- a/com.ibm.wala.core/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Eclipse-LazyStart: true
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.ibm.wala.core
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: com.ibm.wala.shrike,
diff --git a/com.ibm.wala.core/mvncentral.xml b/com.ibm.wala.core/mvncentral.xml
index 0a47b56f9..25bdccc9c 100644
--- a/com.ibm.wala.core/mvncentral.xml
+++ b/com.ibm.wala.core/mvncentral.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.ibm.wala</groupId>
   <artifactId>com.ibm.wala.core</artifactId>
-  <version>1.3.7</version>  
+  <version>1.3.8-SNAPSHOT</version>  
   <packaging>jar</packaging>
   <name>WALA Core</name>
   <description>Core WALA analysis libraries</description>
@@ -45,12 +45,12 @@
     <dependency>
       <groupId>com.ibm.wala</groupId>
       <artifactId>com.ibm.wala.util</artifactId>
-      <version>1.3.7</version>
+      <version>1.3.8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.ibm.wala</groupId>
       <artifactId>com.ibm.wala.shrike</artifactId>
-      <version>1.3.7</version>
+      <version>1.3.8-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/com.ibm.wala.core/pom.xml b/com.ibm.wala.core/pom.xml
index 8637b829e..259954a8f 100644
--- a/com.ibm.wala.core/pom.xml
+++ b/com.ibm.wala.core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>WALA</artifactId>
         <groupId>com.ibm.wala</groupId>
-        <version>1.3.7</version>
+        <version>1.3.8-SNAPSHOT</version>
     </parent>
   <artifactId>com.ibm.wala.core</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF b/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF
index b809d11c3..201532489 100644
--- a/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: WalaDalvikBytecodeTests
 Bundle-SymbolicName: com.ibm.wala.dalvik.test
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-Activator: com.ibm.wala.dalvik.test.Activator
 Bundle-Vendor: IBM
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/com.ibm.wala.dalvik.test/pom.xml b/com.ibm.wala.dalvik.test/pom.xml
index f04f07d92..486c7c7d4 100644
--- a/com.ibm.wala.dalvik.test/pom.xml
+++ b/com.ibm.wala.dalvik.test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
       <groupId>com.ibm.wala</groupId>
       <artifactId>WALA</artifactId>
-      <version>1.3.7</version>
+      <version>1.3.8-SNAPSHOT</version>
   </parent>
   <artifactId>com.ibm.wala.dalvik.test</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.ibm.wala.dalvik/META-INF/MANIFEST.MF b/com.ibm.wala.dalvik/META-INF/MANIFEST.MF
index 379ad4b8e..b57ef0242 100644
--- a/com.ibm.wala.dalvik/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.dalvik/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: WALA Dalvik Bytecode Frontend
 Bundle-SymbolicName: com.ibm.wala.dalvik
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Require-Bundle: com.ibm.wala.cast;bundle-version="1.0.0",
  com.ibm.wala.core;bundle-version="1.1.3",
  com.ibm.wala.ide;bundle-version="1.1.3",
diff --git a/com.ibm.wala.dalvik/pom.xml b/com.ibm.wala.dalvik/pom.xml
index ec3e1683b..159311940 100644
--- a/com.ibm.wala.dalvik/pom.xml
+++ b/com.ibm.wala.dalvik/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>WALA</artifactId>
 		<groupId>com.ibm.wala</groupId>
-		<version>1.3.7</version>
+		<version>1.3.8-SNAPSHOT</version>
 	</parent>
 	<artifactId>com.ibm.wala.dalvik</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/com.ibm.wala.ide-feature/feature.xml b/com.ibm.wala.ide-feature/feature.xml
index 484827d42..eedfa4ec4 100644
--- a/com.ibm.wala.ide-feature/feature.xml
+++ b/com.ibm.wala.ide-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.ibm.wala.ide-feature"
       label="%featureName"
-      version="1.3.7"
+      version="1.3.8.qualifier"
       provider-name="%providerName">
 
    <plugin
diff --git a/com.ibm.wala.ide-feature/pom.xml b/com.ibm.wala.ide-feature/pom.xml
index bff29e332..5499d2779 100644
--- a/com.ibm.wala.ide-feature/pom.xml
+++ b/com.ibm.wala.ide-feature/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>WALA</artifactId>
         <groupId>com.ibm.wala</groupId>
-        <version>1.3.7</version>
+        <version>1.3.8-SNAPSHOT</version>
     </parent>
   <artifactId>com.ibm.wala.ide-feature</artifactId>
   <packaging>eclipse-feature</packaging>
diff --git a/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF b/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF
index f50321703..2f7b9337f 100644
--- a/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: WALA CAst Java JDT Test Plug-in
 Bundle-SymbolicName: com.ibm.wala.ide.jdt.test
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-Activator: com.ibm.wala.cast.java.jdt.test.Activator
 Bundle-Vendor: IBM
 Require-Bundle: com.ibm.wala.cast.java.test;bundle-version="1.0.0",
diff --git a/com.ibm.wala.ide.jdt.test/pom.xml b/com.ibm.wala.ide.jdt.test/pom.xml
index ef816b5a5..5ba034ef4 100644
--- a/com.ibm.wala.ide.jdt.test/pom.xml
+++ b/com.ibm.wala.ide.jdt.test/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>WALA</artifactId>
     <groupId>com.ibm.wala</groupId>
-    <version>1.3.7</version>
+    <version>1.3.8-SNAPSHOT</version>
   </parent>
 
   
diff --git a/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF b/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF
index 71c98ac2f..feb768de1 100644
--- a/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: WALA IDE JDT components
 Bundle-SymbolicName: com.ibm.wala.ide.jdt
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-Activator: com.ibm.wala.ide.jdt.Activator
 Bundle-Vendor: IBM
 Require-Bundle: org.eclipse.ui,
diff --git a/com.ibm.wala.ide.jdt/pom.xml b/com.ibm.wala.ide.jdt/pom.xml
index 4b7e70d70..8b4049ab5 100644
--- a/com.ibm.wala.ide.jdt/pom.xml
+++ b/com.ibm.wala.ide.jdt/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>WALA</artifactId>
         <groupId>com.ibm.wala</groupId>
-        <version>1.3.7</version>
+        <version>1.3.8-SNAPSHOT</version>
     </parent>
   <artifactId>com.ibm.wala.ide.jdt</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF b/com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF
index 784c2ed94..e70cf7055 100644
--- a/com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JSDT Tests
 Bundle-SymbolicName: com.ibm.wala.ide.jsdt.tests;singleton:=true
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Require-Bundle: com.ibm.wala.core;bundle-version="1.1.3",
  com.ibm.wala.cast;bundle-version="1.0.0",
  com.ibm.wala.cast.js;bundle-version="1.0.0",
diff --git a/com.ibm.wala.ide.jsdt.tests/launchers/JSProjectScopeTest.launch b/com.ibm.wala.ide.jsdt.tests/launchers/JSProjectScopeTest.launch
index ae1c3177c..d22ee01c7 100644
--- a/com.ibm.wala.ide.jsdt.tests/launchers/JSProjectScopeTest.launch
+++ b/com.ibm.wala.ide.jsdt.tests/launchers/JSProjectScopeTest.launch
@@ -10,8 +10,8 @@
 <booleanAttribute key="clearws" value="true"/>
 <booleanAttribute key="clearwslog" value="false"/>
 <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<stringAttribute key="deselected_workspace_plugins" value="ForInLoopRewriter,com.ibm.wala.cast,com.ibm.wala.cast.java,com.ibm.wala.cast.java.polyglot,com.ibm.wala.cast.java.polyglot.test,com.ibm.wala.cast.java.test,com.ibm.wala.cast.java.test.data,com.ibm.wala.cast.js,com.ibm.wala.cast.js.html.nu_validator,com.ibm.wala.cast.js.rhino,com.ibm.wala.cast.js.rhino.test,com.ibm.wala.cast.js.test,com.ibm.wala.cast.js.test.data,com.ibm.wala.cast.test,com.ibm.wala.core,com.ibm.wala.core.testdata,com.ibm.wala.core.tests,com.ibm.wala.ide,com.ibm.wala.ide.jdt,com.ibm.wala.ide.jdt.test,com.ibm.wala.ide.jsdt,com.ibm.wala.ide.jsdt.tests,com.ibm.wala.ide.tests,com.ibm.wala.immutability,com.ibm.wala.paStats,com.ibm.wala.shrike,com.ibm.wala.util,hybrid-app-analysis,jstaint-prototype"/>
+<booleanAttribute key="default" value="false"/>
+<stringAttribute key="deselected_workspace_plugins" value="NewAtomicSetsBuilder,com.ibm.appscan.jstaint,com.ibm.appscan.jstaint.analysis.ap,com.ibm.appscan.jstaint.exceptions,com.ibm.appscan.jstaint.harness,com.ibm.appscan.jstaint.hybridapps,com.ibm.appscan.jstaint.rules,com.ibm.appscan.jstaint.util,com.ibm.appscan.jstaint.util.logging,com.ibm.wala.andromeda.js.tests,com.ibm.wala.andromeda.rules,com.ibm.wala.andromeda.util,com.ibm.wala.cast.java,com.ibm.wala.cast.java.polyglot,com.ibm.wala.cast.java.polyglot.test,com.ibm.wala.cast.java.test,com.ibm.wala.cast.java.test.data,com.ibm.wala.cast.js.html.nu_validator,com.ibm.wala.cast.js.jsir,com.ibm.wala.cast.js.rhino.test,com.ibm.wala.cast.js.test,com.ibm.wala.cast.js.test.data,com.ibm.wala.cast.test,com.ibm.wala.core.testdata.java8,com.ibm.wala.dalvik,com.ibm.wala.dalvik.test,com.ibm.wala.dotnet,com.ibm.wala.dotnet.ikvm,com.ibm.wala.dotnet.test,com.ibm.wala.eventRacer,com.ibm.wala.ide.jdt,com.ibm.wala.ide.jdt.test,com.ibm.wala.jstaint.rules,com.ibm.wala.jstaint.util,com.ibm.wala.memsat,com.ibm.wala.memsat.jdt.test,com.ibm.wala.memsat.test,com.ibm.wala.memsat.testdata,com.ibm.wala.memsat.tests.internal,com.ibm.wala.scandroid,com.ibm.wala.worklight,com.ibm.wala.worklight.rules"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
@@ -26,7 +26,8 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JDK 1.6"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/1.7.0 25"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.ide.jsdt.tests.JSProjectScopeTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.ide.jsdt.tests"/>
@@ -35,7 +36,8 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.sdk.ide"/>
 <booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.sun.el@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.jasper.glassfish@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.lucene@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.cvs@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@default:false,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching.macosx@default:default,org.eclipse.jdt.launching.ui.macosx@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.sdk@default:default,org.eclipse.search@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.jsdt.core@default:default,org.eclipse.wst.jsdt.debug.core@default:default,org.eclipse.wst.jsdt.debug.crossfire@default:default,org.eclipse.wst.jsdt.debug.rhino.debugger@default:default,org.eclipse.wst.jsdt.debug.rhino.ui@default:default,org.eclipse.wst.jsdt.debug.rhino@default:default,org.eclipse.wst.jsdt.debug.transport@default:default,org.eclipse.wst.jsdt.debug.ui@default:default,org.eclipse.wst.jsdt.doc@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.wst.jsdt.support.firefox@default:default,org.eclipse.wst.jsdt.support.ie@default:default,org.eclipse.wst.jsdt.ui@default:default,org.hamcrest.core@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.junit*4.10.0.v4_10_0_v20120426-0900@default:default,org.junit4@default:default,org.mozilla.javascript@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava@default:default,com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.logging@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.java7@default:false,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@default:false,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.logback.appender@default:false,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde@default:default,org.eclipse.platform@default:default,org.eclipse.search@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xsd@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="com.ibm.wala.cast.js.rhino@default:default,com.ibm.wala.cast.js@default:default,com.ibm.wala.cast@default:default,com.ibm.wala.core.testdata@default:default,com.ibm.wala.core.tests@default:default,com.ibm.wala.core@default:default,com.ibm.wala.ide.jsdt@default:default,com.ibm.wala.ide.tests@default:default,com.ibm.wala.ide@default:default,com.ibm.wala.shrike@default:default,com.ibm.wala.util@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/com.ibm.wala.ide.jsdt.tests/pom.xml b/com.ibm.wala.ide.jsdt.tests/pom.xml
index de1000796..465344ca6 100644
--- a/com.ibm.wala.ide.jsdt.tests/pom.xml
+++ b/com.ibm.wala.ide.jsdt.tests/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>WALA</artifactId>
     <groupId>com.ibm.wala</groupId>
-    <version>1.3.7</version>
+    <version>1.3.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>com.ibm.wala.ide.jsdt.tests</artifactId>
diff --git a/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF b/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF
index 0c9a6c2cf..21d189d32 100644
--- a/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Jsdt
 Bundle-SymbolicName: com.ibm.wala.ide.jsdt
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-Activator: com.ibm.wala.ide.jsdt.Activator
 Bundle-Vendor: IBM
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/com.ibm.wala.ide.jsdt/pom.xml b/com.ibm.wala.ide.jsdt/pom.xml
index f7edf65f6..2fbfb26be 100644
--- a/com.ibm.wala.ide.jsdt/pom.xml
+++ b/com.ibm.wala.ide.jsdt/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>WALA</artifactId>
     <groupId>com.ibm.wala</groupId>
-    <version>1.3.7</version>
+    <version>1.3.8-SNAPSHOT</version>
   </parent>
   <artifactId>com.ibm.wala.ide.jsdt</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF b/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF
index 1c9e15da2..e8ea44a3f 100644
--- a/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.ibm.wala.ide.tests;singleton:=true
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-Vendor: %providerName
 Require-Bundle: com.ibm.wala.shrike,
  com.ibm.wala.core,
diff --git a/com.ibm.wala.ide.tests/pom.xml b/com.ibm.wala.ide.tests/pom.xml
index 60e0c389e..6915296a2 100644
--- a/com.ibm.wala.ide.tests/pom.xml
+++ b/com.ibm.wala.ide.tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>WALA</artifactId>
     <groupId>com.ibm.wala</groupId>
-    <version>1.3.7</version>
+    <version>1.3.8-SNAPSHOT</version>
   </parent>
   <artifactId>com.ibm.wala.ide.tests</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.ibm.wala.ide/META-INF/MANIFEST.MF b/com.ibm.wala.ide/META-INF/MANIFEST.MF
index 0ad2453e9..9d95049cd 100644
--- a/com.ibm.wala.ide/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.ide/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Eclipse-LazyStart: true
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.ibm.wala.ide
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-Activator: com.ibm.wala.ide.plugin.CorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/com.ibm.wala.ide/pom.xml b/com.ibm.wala.ide/pom.xml
index a862cb3ec..6fe2ec956 100644
--- a/com.ibm.wala.ide/pom.xml
+++ b/com.ibm.wala.ide/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>WALA</artifactId>
         <groupId>com.ibm.wala</groupId>
-        <version>1.3.7</version>
+        <version>1.3.8-SNAPSHOT</version>
     </parent>
   <artifactId>com.ibm.wala.ide</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.ibm.wala.scandroid/META-INF/MANIFEST.MF b/com.ibm.wala.scandroid/META-INF/MANIFEST.MF
index 6e1deea1f..13de8b97a 100644
--- a/com.ibm.wala.scandroid/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.scandroid/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SCanDroid
 Bundle-SymbolicName: com.ibm.wala.scandroid
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-Activator: com.ibm.wala.scandroid.Activator
 Bundle-Vendor: IBM
 Require-Bundle: org.eclipse.ui,
diff --git a/com.ibm.wala.scandroid/pom.xml b/com.ibm.wala.scandroid/pom.xml
index e67d59fcd..862fe72c2 100644
--- a/com.ibm.wala.scandroid/pom.xml
+++ b/com.ibm.wala.scandroid/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>WALA</artifactId>
         <groupId>com.ibm.wala</groupId>
-        <version>1.3.7</version>
+        <version>1.3.8-SNAPSHOT</version>
     </parent>
   <artifactId>com.ibm.wala.scandroid</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.ibm.wala.shrike/META-INF/MANIFEST.MF b/com.ibm.wala.shrike/META-INF/MANIFEST.MF
index 7c16075e7..9d173a1fb 100644
--- a/com.ibm.wala.shrike/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.shrike/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.ibm.wala.shrike
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/com.ibm.wala.shrike/mvncentral.xml b/com.ibm.wala.shrike/mvncentral.xml
index f9afa5b62..7bb3e4f4b 100644
--- a/com.ibm.wala.shrike/mvncentral.xml
+++ b/com.ibm.wala.shrike/mvncentral.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.ibm.wala</groupId>
   <artifactId>com.ibm.wala.shrike</artifactId>
-  <version>1.3.7</version>  
+  <version>1.3.8-SNAPSHOT</version>  
   <packaging>jar</packaging>
   <name>WALA Shrike</name>
   <description>WALA Shrike library for bytecode reading and instrumentation</description>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>com.ibm.wala</groupId>
       <artifactId>com.ibm.wala.util</artifactId>
-      <version>1.3.7</version>
+      <version>1.3.8-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/com.ibm.wala.shrike/pom.xml b/com.ibm.wala.shrike/pom.xml
index aee7da94a..96a604228 100644
--- a/com.ibm.wala.shrike/pom.xml
+++ b/com.ibm.wala.shrike/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>WALA</artifactId>
         <groupId>com.ibm.wala</groupId>
-        <version>1.3.7</version>
+        <version>1.3.8-SNAPSHOT</version>
     </parent>
   <artifactId>com.ibm.wala.shrike</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/InvokeDynamicInstruction.java b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/InvokeDynamicInstruction.java
index ca1babf12..e0409a3dd 100644
--- a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/InvokeDynamicInstruction.java
+++ b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/InvokeDynamicInstruction.java
@@ -152,10 +152,11 @@ public class InvokeDynamicInstruction extends Instruction implements IInvokeInst
   }
 
   public CallSite bootstrap(Class cl) throws ClassNotFoundException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchFieldException {
-    ClassLoader bootstrapCL = cl.getClassLoader();
+    ClassLoader classLoader = cl.getClassLoader();
+    ClassLoader bootstrapCL = classLoader;
 
     Class<?> bootstrapClass = Class.forName(getBootstrap().methodClass().replace('/', '.'), false, bootstrapCL);
-    MethodType bt = MethodType.fromMethodDescriptorString(bootstrap.methodType(), bootstrapCL);
+    MethodType bt = makeMethodType( bootstrapCL, bootstrap.methodType());
     Method bootstrap = bootstrapClass.getMethod(this.bootstrap.methodName(), bt.parameterList().toArray(new Class[ bt.parameterCount() ]));
     Object[] args = new Object[ bt.parameterCount() ];
     
@@ -164,17 +165,30 @@ public class InvokeDynamicInstruction extends Instruction implements IInvokeInst
     impl_lookup.setAccessible(true); // set it accessible
     Lookup lutrusted = (Lookup) impl_lookup.get(myLookup); // get the value of IMPL_LOOKUP from the Lookup instance and save it in a new Lookup object
     args[0] = lutrusted;
-    
     args[1] = getMethodName();
-    args[2] = MethodType.fromMethodDescriptorString(getMethodSignature(), cl.getClassLoader());
+    args[2] = makeMethodType(classLoader, getMethodSignature()); 
     for(int i = 3; i < bt.parameterCount(); i++) {
       args[i] = getBootstrap().callArgument(bootstrapCL,i-3);
     }
     
-    //bootstrap.setAccessible(true);
+    bootstrap.setAccessible(true);
+    
+    System.err.println(cl + " : " + bootstrap);
     
     return (CallSite) bootstrap.invoke(null, args);
   }
+
+  public static MethodType makeMethodType(ClassLoader classLoader, String descriptor) throws ClassNotFoundException {
+    String returnType = Util.makeClass(Util.getReturnType(descriptor));
+    Class returnClass = Class.forName(returnType, false, classLoader);
+    String[] paramTypes = Util.getParamsTypes(null, descriptor);
+    Class[] paramClasses = new Class[ paramTypes.length ];
+    for(int i = 0; i < paramTypes.length; i++) {
+      paramClasses[i] = Class.forName(Util.makeClass(paramTypes[i]), false, classLoader);
+    }
+    MethodType mt = MethodType.methodType(returnClass, paramClasses);
+    return mt;
+  }
   
   static InvokeDynamicInstruction make(ConstantPoolReader cp, int index, int mode) {
     if (mode != OP_invokedynamic) {
diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/BootstrapDumper.java b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/BootstrapDumper.java
index fd1e96382..0bb7aa2ec 100644
--- a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/BootstrapDumper.java
+++ b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/BootstrapDumper.java
@@ -11,6 +11,7 @@
 package com.ibm.wala.shrikeBT.shrikeCT.tools;
 
 import java.io.BufferedWriter;
+import java.io.File;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
@@ -50,9 +51,11 @@ public class BootstrapDumper {
     URL[] urls = new URL[ classpathEntries.length-1 ];
     for(int i = 1; i < classpathEntries.length; i++) {
       System.err.println(classpathEntries[i]);
-     urls[i-1] = new URL(classpathEntries[i]); 
+      File f = new File(classpathEntries[i]);
+      assert f.exists();
+      urls[i-1] = f.toURI().toURL(); 
     }
-    URLClassLoader image = new URLClassLoader(urls, BootstrapDumper.class.getClassLoader().getParent());
+    URLClassLoader image = URLClassLoader.newInstance(urls, BootstrapDumper.class.getClassLoader().getParent());
     
     System.err.println(image);
     
@@ -122,7 +125,7 @@ public class BootstrapDumper {
     
     for (int i = 0; i < methodCount; i++) {
       cr.initMethodAttributeIterator(i, attrs);
-      dumpAttributes(Class.forName(cr.getName(), false, image), cr, i, attrs);
+      dumpAttributes(Class.forName(cr.getName().replace('/', '.'), false, image), cr, i, attrs);
     }
   }
 }
\ No newline at end of file
diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/BootstrapMethodsReader.java b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/BootstrapMethodsReader.java
index 3de8b3204..e67babac6 100644
--- a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/BootstrapMethodsReader.java
+++ b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/BootstrapMethodsReader.java
@@ -119,7 +119,7 @@ public class BootstrapMethodsReader extends AttributeReader {
               return cp.getCPLong(index);
             case ClassConstants.CONSTANT_MethodHandle:
               String className = cp.getCPHandleClass(index);
-              Class<?> cls = Class.forName(className, false, cl);
+              Class<?> cls = Class.forName(className.replace('/', '.'), false, cl);
               String eltName = cp.getCPHandleName(index);
               String eltDesc = cp.getCPHandleType(index);
               MethodType type = MethodType.fromMethodDescriptorString(eltDesc, cl);
@@ -128,7 +128,7 @@ public class BootstrapMethodsReader extends AttributeReader {
               m.setAccessible(true);
               return lk.unreflect(m);
             case ClassConstants.CONSTANT_MethodType:
-              return MethodType.fromMethodDescriptorString(cp.getCPMethodType(index), this.getClass().getClassLoader());
+              return MethodType.fromMethodDescriptorString(cp.getCPMethodType(index), cl);
             default:
               assert false : "invalid type " + t;
             }            
diff --git a/com.ibm.wala.tests-feature/feature.xml b/com.ibm.wala.tests-feature/feature.xml
index 771d52965..1947bfb30 100644
--- a/com.ibm.wala.tests-feature/feature.xml
+++ b/com.ibm.wala.tests-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.ibm.wala.tests-feature"
       label="%featureName"
-      version="1.3.7"
+      version="1.3.8.qualifier"
       provider-name="%providerName">
 
    <plugin
diff --git a/com.ibm.wala.tests-feature/pom.xml b/com.ibm.wala.tests-feature/pom.xml
index f154e3eff..8fb254829 100644
--- a/com.ibm.wala.tests-feature/pom.xml
+++ b/com.ibm.wala.tests-feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>WALA</artifactId>
     <groupId>com.ibm.wala</groupId>
-    <version>1.3.7</version>
+    <version>1.3.8-SNAPSHOT</version>
   </parent>
   <artifactId>com.ibm.wala.tests-feature</artifactId>
   <packaging>eclipse-feature</packaging>
diff --git a/com.ibm.wala.tests.ide-feature/feature.xml b/com.ibm.wala.tests.ide-feature/feature.xml
index 581a3a34d..0b134564f 100644
--- a/com.ibm.wala.tests.ide-feature/feature.xml
+++ b/com.ibm.wala.tests.ide-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.ibm.wala.tests.ide"
       label="%featureName"
-      version="1.3.7"
+      version="1.3.8.qualifier"
       provider-name="%providerName">
 
    <plugin
diff --git a/com.ibm.wala.util/META-INF/MANIFEST.MF b/com.ibm.wala.util/META-INF/MANIFEST.MF
index ec7147f23..d552b3a0f 100644
--- a/com.ibm.wala.util/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.util/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: WALA Util
 Bundle-SymbolicName: com.ibm.wala.util
-Bundle-Version: 1.3.7
+Bundle-Version: 1.3.8.qualifier
 Export-Package: com.ibm.wala.dataflow.graph,
  com.ibm.wala.fixedpoint.impl,
  com.ibm.wala.fixpoint,
diff --git a/com.ibm.wala.util/mvncentral.xml b/com.ibm.wala.util/mvncentral.xml
index d635443f1..f5f668480 100644
--- a/com.ibm.wala.util/mvncentral.xml
+++ b/com.ibm.wala.util/mvncentral.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.ibm.wala</groupId>
   <artifactId>com.ibm.wala.util</artifactId>
-  <version>1.3.7</version>  
+  <version>1.3.8-SNAPSHOT</version>  
   <packaging>jar</packaging>
   <name>WALA utilities</name>
   <description>Utility library included with the T. J. Watson
diff --git a/com.ibm.wala.util/pom.xml b/com.ibm.wala.util/pom.xml
index 4f5a62010..7d8d4bdfb 100644
--- a/com.ibm.wala.util/pom.xml
+++ b/com.ibm.wala.util/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>WALA</artifactId>
     <groupId>com.ibm.wala</groupId>
-    <version>1.3.7</version>
+    <version>1.3.8-SNAPSHOT</version>
   </parent>
   <artifactId>com.ibm.wala.util</artifactId>
   <packaging>eclipse-plugin</packaging>
diff --git a/pom.xml b/pom.xml
index e04de450f..47b78db37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,10 +5,10 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.ibm.wala</groupId>
   <artifactId>WALA</artifactId>
-  <version>1.3.7</version>
+  <version>1.3.8-SNAPSHOT</version>
   <packaging>pom</packaging>
   <properties>
-    <project-version>1.3.7</project-version>
+    <project-version>1.3.8-SNAPSHOT</project-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <build-alias>b000</build-alias>
     <tycho-version>0.19.0</tycho-version>
diff --git a/targets/e42/pom.xml b/targets/e42/pom.xml
index 43d33dd48..af7b8fa51 100644
--- a/targets/e42/pom.xml
+++ b/targets/e42/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.ibm.wala.target</groupId>
 		<artifactId>targets</artifactId>
-		<version>1.3.7</version>
+		<version>1.3.8-SNAPSHOT</version>
 	</parent>
 	<artifactId>e42</artifactId>
 	<packaging>eclipse-target-definition</packaging>
diff --git a/targets/e44/pom.xml b/targets/e44/pom.xml
index d7ea17338..92588165a 100644
--- a/targets/e44/pom.xml
+++ b/targets/e44/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.ibm.wala.target</groupId>
 		<artifactId>targets</artifactId>
-		<version>1.3.7</version>
+		<version>1.3.8-SNAPSHOT</version>
 	</parent>
 	<artifactId>e44</artifactId>
 	<packaging>eclipse-target-definition</packaging>
diff --git a/targets/pom.xml b/targets/pom.xml
index 425b244f0..5bb1fc4da 100644
--- a/targets/pom.xml
+++ b/targets/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.ibm.wala</groupId>
 		<artifactId>WALA</artifactId>
-		<version>1.3.7</version>
+		<version>1.3.8-SNAPSHOT</version>
 	</parent>
 	<groupId>com.ibm.wala.target</groupId>
 	<artifactId>targets</artifactId>