Minor tweaks after a full-on test.