* Build break fixes