minor changes required by osgi integration