Doc fixes and API constency fixes