Another round of universal fixes