fix build problems
25 files changed