diff --git a/hapi-fhir-osgi-core/pom.xml b/hapi-fhir-osgi-core/pom.xml
index f11c34b0afb..601fc310ab0 100644
--- a/hapi-fhir-osgi-core/pom.xml
+++ b/hapi-fhir-osgi-core/pom.xml
@@ -132,10 +132,10 @@
 				<configuration>
 					<instructions>
 						<!--<Export-Package>ca.uhn.fhir</Export-Package> <Export-Package>org.hl7.fhir</Export-Package> -->
-						<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<!--<Embed-Dependency>*;scope=!provided|test</Embed-Dependency> <Embed-Directory>lib</Embed-Directory> <Embed-Transitive>true</Embed-Transitive> -->
 						<_nouses>true</_nouses>
-						<_removeheaders>Built-By, Include-Resource, Private-Package</_removeheaders>
+						<_removeheaders>Built-By, Include-Resource, Private-Package, Require-Capability</_removeheaders>
 						<!-- <Private-Package>org.foo.myproject.*</Private-Package> <Bundle-Activator>org.foo.myproject.impl1.Activator</Bundle-Activator> -->
 						<!-- <Embed-Dependency>*;scope=compile|runtime;inline=false;artifactId=hapi-fhir-*</Embed-Dependency> -->
 						<Import-Package>
@@ -146,6 +146,7 @@
 							com.google.*;resolution:=optional;-remove-attribute:=version,
 							com.phloc.commons;resolution:=optional;-remove-attribute:=version,
 							com.phloc.*;resolution:=optional;-remove-attribute:=version,
+							javassist;-remove-attribute:=version,
 							javax.*;-remove-attribute:=version,
 							net.sf.saxon;resolution:=optional,
 							org.apache.commons.*;-remove-attribute:=version,