Minor changes to server