copy/paste fixes