Gfx: Fix mistakes in b737352