fix up some outstanding compilation problems
4 files changed