Some smaller changes.