Fixes from self-review.