Minor changes in client's code