Fix up compilation and test failures
13 files changed