Fix copy/paste bugs 7