Fixed other files to work with OSGi