Make some additional tidying corrections.