Gfx: Additional changes to 56218f7