What

Fix some issues detected by the Opam CI.

Why

How

Manually testing the MR

Checklist

Update CHANGES.md. No need to document changes to documentation and tests.
Make sure all new values, types etc. are documented in .mli files and that the generated documentation looks ok.
Add tests in test/, if relevant.