Sync with pierre
Broken linking of the ocaml libs