build fixes
Merge branch 'master'