fixed some old navigator uses