fix build issues
3 files changed