Fixed some apis.