Small changes from code review with Nick