Fix a few service-menu bugs