Fix a couple issues in the services tab