third round of fixes