ENH: more fixes