A few smaller changes.