More OSGI fixes