Update gfx paths before merge