DDF-216: fixes found when building with clean repo