Build fixes
Merge branch 'build_fixes'