Intermediate commit for #714
Fixed some detected problems.
Authored by: numere 2022-06-27
Parent: [r1169]
Child: [r1171]