More client / server enhancements