2nd round of fixes