2 fixes one of which overlaps with what you have done