Fix compilation errors.
6 files changed