A few more copy/paste fixes.