Diverses corrections + test PO