Fix copy/paste bugs 5