Resolve more compile errors after merge.
5 files changed