Fix copy/paste bugs 1