Another round of minor fixes