Tweaks and twerks

One of which was useful, the other...