Some doc and API fixes