More updates with oasis2opam