Fix up some of the API.