Bug fixes with navigation controllers