more little compile fixes
6 files changed