More out-of-tree build fixes
2 files changed