first pass on build fix
more build fixes
Merge branch 'cpp-dev'