Merged fixes from doc