Small changes from meeting