Gfx: Additional changes to d003db6