Some touches to the api.