Another round of fixes. RC2