Trivial tweaks