Fixes for client / server operation.  Hsqldb is working well