Build fixes.
3 files changed