Bug #2590 Long server names...

I fixed some problems with the code.