API minor fixes.