Slight GfxHandler changes