Fix copy/paste bugs 2