Another round of fixes