Even more patches for the navigation