#3591585 follow-up fixes

Ted Bowmanrequested to merge
issue/canvas-3591585:3591585-fixes into 1.x

Small follow-ups spotted after merge in !1155 (merged)

Closes #3591585 (closed)

Merge request reports