Navigation OCD fixes