Two small fixes for the navigation controls