Fix up conformity to API.