Fix some lines that would trigger fatal errors (v54r3-patches)

Fix some lines that would trigger fatal errors

See merge request !1998 (merged)

(cherry picked from commit 6c96014f)