Fixes suggested by reviewers.