additional round of fixes