More copy/paste errors fixed