Fix build failures
7 files changed