Clean, bare minimum for passing build fixes Year4000/Meta#2