Merge branch 'feature/smaller-cleanups' into 'master'

Feature/smaller cleanups

as the title suggests, these are a couple of smaller fixes, which are not directly related and aren't important enough to manage them in separate branches.

See merge request !13
(cherry picked from commit 7fb6aa4d)

Signed-off-by: Steffen Müthing <muething@dune-project.org>