MNT: more tweaks to get this right