fix some API cases