Fixes for genart review #403

Closed laurencelundblade closed 1 year ago