Minor changes in NavigationSystem