Gfx: Minor fixes