fixed self references in gfx