[PATCH 10/10] some small followon touchups