Fixed minor errors after adding APi_xxx arrays