Fix copy/paste bugs 3