Build break fixes