Fixes for Navigation mode switching bugs