[NF] Minor changes.