fix build bugs.
8 files changed