Minor modifications to client to support incoming server changes