Trivial fixes