Resolved even more compiler errors for ticket #601
Authored by: numere 2021-08-13
Parent: [r956]
Child: [r958]