Fix build and a stray diff.