MNT: Minor changes