Trivial improvements