SCORE-90. Fix build failures.