Remove ambiguous helper, add operators to server_entry