Fix copy/paste bugs 8