GDI02 fixes

Followup of 4399