Fixes dependency issues in felix