Fixing osgi imports