Minor fixes for Server / client processing.