* build break fixes