Minor changes, part 2