More gfx fixes