Quick fixes for custom servernames