Fix the build, and a crash.