[build] Fix build
Merge pull request #35 from faenil/nemomerge_fixes

[build] Fix build