Small fixes to serverlist bugs