Fix and improve document's paths