Set of fixes #2

Merged
muellerr merged 1 commits from smaller-fixes into main 2024-06-16 18:57:11 +02:00