Gfx: Minor adjustments