More api
Fix errors