Fix and generate doc