Fixing serverlist a bit more