doc_element fixes