Small changes from client