Small changes after Mike's comments