Fixed some TPNav bugs