Fix copy/paste bugs 4