Fix build issues
4 files changed