Fix navigation defaults issues