Trivial fixes.