minor corrections on the client