Bug 20691: (QA follow-up) API-related fixes