OSGi fix to bring into line with master