more copy/paste fixes