Fixed static data in .navigateTo and a couple other oops