OSGi related runtime fixes