Another round of fixes.