Final OSGI changes