Fix more of my copy/paste errors. Someone was in full-on nerd rage yesterday it seems...