Changes via code review with Dave