fixed compile errors
8 files changed