navigator: uncomment fixed stuff