API check improvements