more gfx fixes