Some compile fixes found by Larry Doolittle
4 files changed