Minor bugfixes june 2023
#421

JoschD wants to merge bugfixes_june_2023 into master

We do not currently have an analysis of these two commits