Fixes build errors.
Merge branch 'hotfix/0.0.3-osgi'