Some API fixes.