Minor update, part 2 of 112415