Fix an embarrassing number of C+P errors