small changes to client to make it compliant