Minor fixes

Henrik Hüttemannrequested to merge
hh-fixes into main

Merge request reports