Various last minute fixes

Georges Racinetrequested to merge
topic/heptapod/pre-release-fixes into branch/heptapod

Spotted thanks to the functional tests.

Merge request reports