New round of fixes