Small fixes

Maja Schneiderrequested to merge
small-fixes into main

Implements some minor fixes to the code. Needs to be rebased after fix-cicd branch has been merged.

Edited by Maja Schneider

Merge request reports