Small API fixes.