Conformed client\server to Fixes-By-Simon

Conformed client\server to Fixes-By-Simon

- Made Client\Server modules compatible with changes in static factory
methods made by Simon in marged branch "Fixes-by-Simon".

Jeremy. Allen. Wildsmith