I see several changes here that look independent - what had to be fixed, and why?