Build break fixes.