Fixing NAV registry problems