Minor improvement to server