Fix assorted merge-caused build errors
4 files changed