Few changes to the clients