Navigation and walking more robust