GM107 variant fixes.