Fix build problems
14 files changed