fix build errors
7 files changed