Fixes for OSGi plugin service