Another round of small minor fixes.