Small changes from CR