second phase of fixes