Fix edoc errors
Merge branch 'fix-edoc'