Few extra minor changes to the api.