Fix copy/paste bugs 9