This MR fixes some small issues:
Those were detected while playing with newer hugo (!673 (merged)) that makes them fatal errors.