More small API fixes.