Fix the DP navigation issues.