Some fixes to server marshalling.