diff --git a/assembly/features/org.eclipse.jpt.assembly.feature/feature.xml b/assembly/features/org.eclipse.jpt.assembly.feature/feature.xml
index 1ab52e5..a6b6977 100644
--- a/assembly/features/org.eclipse.jpt.assembly.feature/feature.xml
+++ b/assembly/features/org.eclipse.jpt.assembly.feature/feature.xml
@@ -15,7 +15,7 @@
 <feature
       id="org.eclipse.jpt.assembly.feature"
       label="%featureName"
-      version="2.3.2.qualifier"
+      version="2.3.3.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.license"
diff --git a/assembly/features/org.eclipse.jpt.assembly.feature/pom.xml b/assembly/features/org.eclipse.jpt.assembly.feature/pom.xml
index 39ebac2..39f0e67 100644
--- a/assembly/features/org.eclipse.jpt.assembly.feature/pom.xml
+++ b/assembly/features/org.eclipse.jpt.assembly.feature/pom.xml
@@ -22,6 +22,6 @@
 
   <groupId>org.eclipse.webtools.dali</groupId>
   <artifactId>org.eclipse.jpt.assembly.feature</artifactId>
-  <version>2.3.2-SNAPSHOT</version>
+  <version>2.3.3-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/jaxb/features/org.eclipse.jpt.jaxb.feature/feature.xml b/jaxb/features/org.eclipse.jpt.jaxb.feature/feature.xml
index fa31ca3..31c5cb0 100644
--- a/jaxb/features/org.eclipse.jpt.jaxb.feature/feature.xml
+++ b/jaxb/features/org.eclipse.jpt.jaxb.feature/feature.xml
@@ -15,7 +15,7 @@
 <feature
       id="org.eclipse.jpt.jaxb.feature"
       label="%featureName"
-      version="1.5.100.qualifier"
+      version="1.5.200.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.jpt.jaxb.branding"
       license-feature="org.eclipse.license"
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/META-INF/MANIFEST.MF
index 7e89b76..8fda47c 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/META-INF/MANIFEST.MF
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.jpt.jaxb.ui;singleton:=true
-Bundle-Version: 1.5.101.qualifier
+Bundle-Version: 1.5.200.qualifier
 Bundle-Activator: org.eclipse.jpt.jaxb.ui.internal.plugin.JptJaxbUiPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml
index 093f6ef..07ff6d9 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml
@@ -120,9 +120,10 @@
 	
 		<!-- activate = "true", but our plug-in will only activate if the JAXB proposal category is enabled (has JAXB facet) bug 386358 -->
 		<javaCompletionProposalComputer
-			class="org.eclipse.jpt.jaxb.ui.internal.JaxbJavaCompletionProposalComputer"
-			categoryId="org.eclipse.jpt.jaxb.ui.jaxbCompletionProposals"
-			activate="true">
+        activate="true"
+        categoryId="org.eclipse.jpt.jaxb.ui.jaxbCompletionProposals"
+        class="org.eclipse.jpt.jaxb.ui.internal.JaxbJavaCompletionProposalComputer"
+        requiresUIThread="false">
 			<partition type="__dftl_partition_content_type"/>
 			<partition type="__java_string"/>
 		</javaCompletionProposalComputer>
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/pom.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/pom.xml
index d580ce7..c315923 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/pom.xml
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/pom.xml
@@ -22,6 +22,6 @@
 
   <groupId>org.eclipse.webtools.dali</groupId>
   <artifactId>org.eclipse.jpt.jaxb.ui</artifactId>
-  <version>1.5.101-SNAPSHOT</version>
+  <version>1.5.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>