Build fixes to fix ivy-resolve
Merge pull request #269 from tmorgner/master

Build fixes to fix ivy-resolve