Trivial fixes

A few trivial fixes.