CRISv10: Trivial fixes.