Some fixed to the part 10 code.