More build break fixing.