Minor changes to server-side implementation