A few tidy ups.