Minor changes to server2.