Fixed many compiler errors for ticket #601
Authored by: numere 2021-08-13
Parent: [r954]
Child: [r956]