MNT: Fixes suggested by Caswell