Third round of fixes