Miscellaneous fixes to satisfy the build.