Minor changes to Server class