Some server list removal fixes.