Attempt to fix gfx_macros