Address MSC16 warning
Add missing ABCAPI qualifiers