Solve some OSGi exports and features issues.