Fix up more changes.