Fix copy/paste bugs 6