Nav related fixes