Fixing osgi issues