[NF] Minor changes (#13).