Several fixes, navigation fix