Adress last OSGi merge comments