Fix things for servers