fix various compilations issues
2 files changed