Some minor final changes.