ENH Some more minor changes