Fix egregious old errors