Further fixes for dot navigation