Another round of smaller fixes.