Some fixes to coordinate navigation system