Finishing the navigation corrections