Fixes to the get_context_instance and build_navigation errors.