Fix copy/paste bugs 10