Fix long server names