Repair missing-Var crashes plus minor initialization faults
Authored by: vampm 2022-08-31
Parent: [r184]
Child: [r186]
