A bit of QA fixes all over the place.