Better OSGI compliance