NaN MakeFlat bug fixed - Double UpdateNavPrimaryNavTarget bug fixed