Fix known services issues