Fix the build with a few odds and ends.