RAD-80 fixes to build
Merge branch 'refs/heads/rad-80'