ENH A few minor updates