hotfixes to sys-nav