Various fixes for main

Emmanuele Bassirequested to merge
ebassi/gen-docs into main

A host of various bug fixes.

Merge request reports