[api] More api inconsistencies fixed.