SavedState now auto included with navcore + misc