Fix a few misc warnings and bugs

Merged Bastien Nocera requested to merge hadess/boatswain:wip/hadess/fixes into main

Merge request reports