Final tweeks for the Navi-X support.