Minor changes to server1 and server2.