Fix dependency issues
Merge pull request #1750 from jimmidyson/sisu-dependency-issues

Fix dependency issues