Fix build failures.