gfx fixes and constants split