Corrected unseen compilation issues created in last refactoring.
Authored by: jflavoie 2020-12-03
Parent: [r44]
Child: [r46]