Some more APIs fixes.